Add realm configuration to get primary user store domain name.

wso2-extensions · Dec 7, 2022 · 832dde6 · 832dde6
1 parent 2e6a5a0
commit 832dde6
Showing 1 changed file with 22 additions and 8 deletions.
diff --git a/...cim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java b/...cim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
@@ -2044,17 +2044,31 @@ private Set<org.wso2.carbon.user.core.common.User> getMultiAttributeFilteredUser
     private int getMaxLimit(String domainName) {
 
         int givenMax = UserCoreConstants.MAX_USER_ROLE_LIST;
-        if (StringUtils.isEmpty(domainName)) {
-            domainName = UserCoreConstants.PRIMARY_DEFAULT_DOMAIN_NAME;
-        }
 
-        if (carbonUM.getSecondaryUserStoreManager(domainName).getRealmConfiguration()
-                .getUserStoreProperty(UserCoreConstants.RealmConfig.PROPERTY_MAX_USER_LIST) != null) {
-            givenMax = Integer.parseInt(carbonUM.getSecondaryUserStoreManager(domainName).getRealmConfiguration()
-                    .getUserStoreProperty(UserCoreConstants.RealmConfig.PROPERTY_MAX_USER_LIST));
+        try {
+            if (StringUtils.isEmpty(domainName)) {
+                domainName = carbonUM.getRealmConfiguration().getUserStoreProperty(UserCoreConstants.RealmConfig.
+                        PROPERTY_DOMAIN_NAME);
+                if(StringUtils.isEmpty(domainName)){
+                    domainName = UserCoreConstants.PRIMARY_DEFAULT_DOMAIN_NAME;
+                }
+                if (log.isDebugEnabled()) {
+                    log.debug("Primary user store DomainName picked as " + domainName);
+                }
+            }
+            if (carbonUM.getSecondaryUserStoreManager(domainName).getRealmConfiguration()
+                    .getUserStoreProperty(UserCoreConstants.RealmConfig.PROPERTY_MAX_USER_LIST) != null) {
+                givenMax = Integer.parseInt(carbonUM.getSecondaryUserStoreManager(domainName).getRealmConfiguration()
+                        .getUserStoreProperty(UserCoreConstants.RealmConfig.PROPERTY_MAX_USER_LIST));
+            }
+
+            return givenMax;
+
+        } catch(NullPointerException e) {
+            String msg = "PRIMARY user store domain name cannot be a null value.";
+            throw new NullPointerException(msg);
         }
 
-        return givenMax;
     }
 
     /**