From 89d796d62d8ab2caa3affc17694244d85af3b6c8 Mon Sep 17 00:00:00 2001
From: hisanhunais <hisan.live@gmail.com>
Date: Sun, 27 Aug 2023 14:25:26 +0530
Subject: [PATCH] Fix NPE in userstore preference order feature

---
 .../carbon/user/core/common/AbstractUserStoreManager.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java
index 15cf5b06693..fabd61d1691 100644
--- a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java
+++ b/core/org.wso2.carbon.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()) {