commit 333d0ca107cf66e0c227c9fe56765935413330dd
author Jonathan Gathman <jonathan.gathman@att.com> Thu Nov 21 14:40:25 2019 +0000
committer Gerrit Code Review <gerrit@onap.org> Thu Nov 21 14:40:25 2019 +0000
tree 30e4ddbecf5801f9ff45ecd408aa63eb698a36ba
parent 2251548a65a7d42d652dc0ecc020b1c8582e0c79
parent 28a45e41fc0a699b8213c4c508dea08e0aac46f7

Merge "merge if statement with enclsoing one"

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
--- 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 @@
                 }
                 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;
     }