Merge pull request #3658 from hisanhunais/userstore-preference-issue-…

…4.8.x [4.8.x] Fix NPE After Enabling Userstore Preference Order Feature
wso2 · Oct 6, 2023 · 0bf7a95 · 0bf7a95
2 parents a3df9e5 + 89d796d
commit 0bf7a95
Showing 1 changed file with 2 additions and 2 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
@@ -11261,8 +11261,8 @@ private AuthenticationResult authenticateInternalWithID(String preferredUserName
             // domain name provided with user name.
 
             try {
-                String preferredUserNameProperty = claimManager
-                        .getAttributeName(getMyDomainName(), preferredUserNameClaim);
+                String preferredUserNameProperty = abstractUserStoreManager.getClaimManager()
+                        .getAttributeName(abstractUserStoreManager.getMyDomainName(), preferredUserNameClaim);
                 // Let's authenticate with the primary UserStoreManager.
 
                 if (abstractUserStoreManager.isUniqueUserIdEnabled()) {