Merge "Extract the assignment out of this expression"

[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 943b92f..2ada75d 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
@@ -64,15 +64,15 @@ public class OrganizationFactory {
             }
         }
         if(firstOrg==null) { // attempt to load DefaultOrg
-               try {
-                               Class<?> cls = Class.forName("org.onap.aaf.org.DefaultOrg");
-                               @SuppressWarnings("unchecked")
-                               Constructor<Organization> cnst = (Constructor<Organization>)cls.getConstructor(Env.class,String.class);
-                               String realm = env.getProperty(Config.AAF_DEFAULT_REALM,"people.osaaf.org");
-                               defaultOrg = cnst.newInstance(env,realm);
-                       } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException | SecurityException | IllegalArgumentException | InvocationTargetException e) {
-                       env.warn().log("Default Organization Module not linked in",e);
-                       }
+            try {
+                Class<?> cls = Class.forName("org.onap.aaf.org.DefaultOrg");
+                @SuppressWarnings("unchecked")
+                Constructor<Organization> cnst = (Constructor<Organization>)cls.getConstructor(Env.class,String.class);
+                String realm = env.getProperty(Config.AAF_DEFAULT_REALM,"people.osaaf.org");
+                defaultOrg = cnst.newInstance(env,realm);
+            } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException | SecurityException | IllegalArgumentException | InvocationTargetException e) {
+                env.init().log("Default Organization Module not linked in",e);
+            }
         }
         if (defaultOrg == null) {
             defaultOrg = firstOrg;
@@ -142,7 +142,7 @@ public class OrganizationFactory {
         return org;
     }
 
-    public static Organization get(AuthzTrans trans) throws OrganizationException {
+    public static Organization get(AuthzTrans trans){
         String domain = FQI.reverseDomain(trans.user());
         Organization org = orgs.get(domain);
         if (org==null) {