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
Merge "AbsTrans.java-sonar fixes"
[aaf/authz.git]
/
auth
/
auth-core
/
src
/
main
/
java
/
org
/
onap
/
aaf
/
auth
/
org
/
OrganizationFactory.java
diff --git
a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java
b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java
index
867d298
..
6d559de
100644
(file)
--- a/
auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java
+++ b/
auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java
@@
-131,13
+131,13
@@
public class OrganizationFactory {
}
env.init().printf("Instantiated %s with %s%s",orgNS,orgClass,(isDefault?" as default":""));
}
- if (
org==null)
{
- if (defaultOrg!=null) {
+ if (
(org==null) && (defaultOrg!=null))
{
+
org=defaultOrg;
orgs.put(orgNS, org);
}
}
- }
+
return org;
}