code refactoring

wso2-extensions · Jun 29, 2023 · d43637a · d43637a
1 parent b3a1b2a
commit d43637a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/AccessTokenIssuer.java b/...identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/AccessTokenIssuer.java
@@ -785,8 +785,8 @@ private String getSubjectClaimFromUserStore(String subjectClaimUri, Authenticate
         AbstractUserStoreManager userStoreManager = (AbstractUserStoreManager) IdentityTenantUtil
                 .getRealm(authenticatedUser.getTenantDomain(), authenticatedUser.toFullQualifiedUsername())
                 .getUserStoreManager();
-        if (!userStoreManager.isExistingUserWithID(authenticatedUser.getUserId()) && OAuth2ServiceComponentHolder
-                .getInstance().isOrganizationManagementEnabled()) {
+        if (OAuth2ServiceComponentHolder.getInstance().isOrganizationManagementEnabled() &&
+                !userStoreManager.isExistingUserWithID(authenticatedUser.getUserId())) {
             userStoreManager = getUserStoreManagerFromUserResideOrganization(authenticatedUser.getTenantDomain(),
                     authenticatedUser.getUserId()).orElse(userStoreManager);
         }