Merge pull request #1136 from thusithathilina/release-4.4.9

CARBON-16038: Cherry-picked the fix from 4.4.x
wso2 · Aug 26, 2016 · ef10837 · ef10837
2 parents c20dcfc + a7df027
commit ef10837
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/...on.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java b/...on.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java
@@ -4091,25 +4091,26 @@ public void addSecondaryUserStoreManager(RealmConfiguration userStoreRealmConfig
             return;
         }
 
-        // Creating new UserStoreManager
-        UserStoreManager manager = createSecondaryUserStoreManager(userStoreRealmConfig, realm);
+        boolean isDisabled = Boolean.parseBoolean(userStoreRealmConfig
+                .getUserStoreProperty(UserCoreConstants.RealmConfig.USER_STORE_DISABLED));
 
         String domainName = userStoreRealmConfig
                 .getUserStoreProperty(UserCoreConstants.RealmConfig.PROPERTY_DOMAIN_NAME);
 
-        if (domainName != null) {
-            if (this.getSecondaryUserStoreManager(domainName) != null) {
-                String errmsg = "Could not initialize new user store manager : " + domainName
-                        + " Duplicate domain names not allowed.";
-                if (log.isDebugEnabled()) {
-                    log.debug(errmsg);
-                }
-                throw new UserStoreException(errmsg);
-            } else {
-                boolean isDisabled = Boolean.parseBoolean(userStoreRealmConfig
-                        .getUserStoreProperty(UserCoreConstants.RealmConfig.USER_STORE_DISABLED));
-                if (isDisabled) {
-                    log.warn("Secondary user store disabled with domain " + domainName + ".");
+        if (isDisabled) {
+            log.warn("Secondary user store disabled with domain " + domainName + ".");
+        } else {
+            // Creating new UserStoreManager
+            UserStoreManager manager = createSecondaryUserStoreManager(userStoreRealmConfig, realm);
+
+            if (domainName != null) {
+                if (this.getSecondaryUserStoreManager(domainName) != null) {
+                    String errmsg = "Could not initialize new user store manager : " + domainName
+                            + " Duplicate domain names not allowed.";
+                    if (log.isDebugEnabled()) {
+                        log.debug(errmsg);
+                    }
+                    throw new UserStoreException(errmsg);
                 } else {
                     // Fulfilled requirements for adding UserStore,
 
@@ -4127,10 +4128,10 @@ public void addSecondaryUserStoreManager(RealmConfiguration userStoreRealmConfig
                         log.debug("UserStoreManager : " + domainName + "added to the list");
                     }
                 }
+            } else {
+                log.warn("Could not initialize new user store manager.  "
+                        + "Domain name is not defined");
             }
-        } else {
-            log.warn("Could not initialize new user store manager.  "
-                    + "Domain name is not defined");
         }
     }