Merge pull request #5259 from janakamarasena/api-auth-poc

Fix possible NPE
wso2 · Dec 2, 2023 · 1c4bad9 · 1c4bad9
2 parents 0a19a08 + aece84f
commit 1c4bad9
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/...bon/identity/application/authentication/framework/internal/FrameworkServiceComponent.java b/...bon/identity/application/authentication/framework/internal/FrameworkServiceComponent.java
@@ -526,13 +526,15 @@ protected void setAuthenticator(ApplicationAuthenticator authenticator) {
 
     private static String[] getTags(ApplicationAuthenticator authenticator) {
 
-        String[] existingTags = authenticator.getTags();
-        String[] tags = new String[existingTags.length + 1];
-        System.arraycopy(existingTags, 0, tags, 0, existingTags.length);
-        if (authenticator.isAPIBasedAuthenticationSupported()) {
-            tags[tags.length - 1] = API_AUTH;
+        if (authenticator == null) {
+            return new String[0];
         }
-        return tags;
+        List<String> tagList = new ArrayList<>();
+        if (authenticator.getTags() != null) {
+            Collections.addAll(tagList, authenticator.getTags());
+        }
+        tagList.add(API_AUTH);
+        return tagList.toArray(new String[0]);
     }
 
     @Reference(