summaryrefslogtreecommitdiffstats
path: root/auth
diff options
context:
space:
mode:
authormanisha07 <cmanis10@in.ibm.com>2019-11-07 13:48:58 +0530
committermanisha07 <cmanis10@in.ibm.com>2019-11-07 13:49:07 +0530
commit28a45e41fc0a699b8213c4c508dea08e0aac46f7 (patch)
treef26cf1ad176ae8c00f67508728fa96bf01e9b48c /auth
parent333a035c095351e496328ec72c82beb65507e71b (diff)
merge if statement with enclsoing one
Issue-ID: AAF-1031 Change-Id: I12c3ae316342d3dc5d1245dba6d86a7124b7fb0c Signed-off-by: manisha07 <cmanis10@in.ibm.com>
Diffstat (limited to 'auth')
-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;
}