Merge pull request #12745 from chamilaadhi/org_visibility

Fix NPE
wso2 · Jan 11, 2025 · 43b2f8d · 43b2f8d
2 parents 0a13353 + b58d3a2
commit 43b2f8d
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/...n.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/jwt/JWTValidationServiceImpl.java b/...n.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/jwt/JWTValidationServiceImpl.java
@@ -71,13 +71,15 @@ public String getKeyManagerNameIfJwtValidatorExist(SignedJWTInfo signedJWTInfo)
         String issuer = signedJWTInfo.getJwtClaimsSet().getIssuer();
         List<KeyManagerDto> keyManagerDtoList = KeyManagerHolder.getKeyManagerByIssuer(tenantDomain, issuer);
         KeyManagerDto keyManagerDto = null;
-        if (keyManagerDtoList.size() == 1) { // only one keymanager. no need to check if it can handle token
-            keyManagerDto = keyManagerDtoList.get(0);
-        } else {
-            for (KeyManagerDto kmrDto : keyManagerDtoList) {
-                if (kmrDto.getKeyManager().canHandleToken(signedJWTInfo.getToken())) {
-                    keyManagerDto = kmrDto;
-                    break;
+        if (keyManagerDtoList != null) {
+            if (keyManagerDtoList.size() == 1) { // only one keymanager. no need to check if it can handle token
+                keyManagerDto = keyManagerDtoList.get(0);
+            } else {
+                for (KeyManagerDto kmrDto : keyManagerDtoList) {
+                    if (kmrDto.getKeyManager().canHandleToken(signedJWTInfo.getToken())) {
+                        keyManagerDto = kmrDto;
+                        break;
+                    }
                 }
             }
         }