summaryrefslogtreecommitdiffstats
path: root/auth/auth-core
diff options
context:
space:
mode:
authorJonathan Gathman <jonathan.gathman@att.com>2019-11-21 14:40:25 +0000
committerGerrit Code Review <gerrit@onap.org>2019-11-21 14:40:25 +0000
commit333d0ca107cf66e0c227c9fe56765935413330dd (patch)
tree30e4ddbecf5801f9ff45ecd408aa63eb698a36ba /auth/auth-core
parent2251548a65a7d42d652dc0ecc020b1c8582e0c79 (diff)
parent28a45e41fc0a699b8213c4c508dea08e0aac46f7 (diff)
Merge "merge if statement with enclsoing one"
Diffstat (limited to 'auth/auth-core')
-rw-r--r--auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java6
1 files changed, 3 insertions, 3 deletions
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 867d2984..6d559de5 100644
--- 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;
}