Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
changed to unmaintained
[aaf/authz.git]
/
auth
/
auth-deforg
/
src
/
main
/
java
/
org
/
onap
/
aaf
/
org
/
DefaultOrg.java
diff --git
a/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java
b/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java
index
307c9c9
..
c7f3b1c
100644
(file)
--- a/
auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java
+++ b/
auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java
@@
-68,13
+68,12
@@
public class DefaultOrg implements Organization {
root_ns = env.getProperty(Config.AAF_ROOT_NS,Config.AAF_ROOT_NS_DEF);
try {
root_ns = env.getProperty(Config.AAF_ROOT_NS,Config.AAF_ROOT_NS_DEF);
try {
- String defFile;
- String temp=env.getProperty(defFile = (getClass().getName()+".file"));
+ String temp=env.getProperty(realm +".file");
File fIdentities=null;
if (temp==null) {
temp = env.getProperty(AAF_DATA_DIR);
if (temp!=null) {
File fIdentities=null;
if (temp==null) {
temp = env.getProperty(AAF_DATA_DIR);
if (temp!=null) {
- env.warn().log(
defFile,
" is not defined. Using default: ",temp+"/identities.dat");
+ env.warn().log(
"Datafile for " + realm +
" is not defined. Using default: ",temp+"/identities.dat");
File dir = new File(temp);
fIdentities=new File(dir,"identities.dat");
File dir = new File(temp);
fIdentities=new File(dir,"identities.dat");
@@
-706,4
+705,9
@@
public class DefaultOrg implements Organization {
return 0;
}
}
return 0;
}
}
+
+ @Override
+ public boolean isUserExpireExempt(String user, Date expires) {
+ return false;
+ }
}
}