Merge pull request #614 from JeethJJ/master-24083

AssociatedRolesConfig null check is only required when getting list of roles
wso2 · May 17, 2024 · ed8d783 · ed8d783
2 parents 01ee988 + bc8a9a2
commit ed8d783
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/...pi/server/application/management/v1/core/functions/application/UpdateAssociatedRoles.java b/...pi/server/application/management/v1/core/functions/application/UpdateAssociatedRoles.java
@@ -36,13 +36,15 @@ public void apply(ServiceProvider serviceProvider, AssociatedRolesConfig associa
 
         org.wso2.carbon.identity.application.common.model.AssociatedRolesConfig rolesConfig =
                 new org.wso2.carbon.identity.application.common.model.AssociatedRolesConfig();
-        if (associatedRolesConfig != null && associatedRolesConfig.getRoles() != null) {
+        if (associatedRolesConfig != null) {
             rolesConfig.setAllowedAudience(associatedRolesConfig.getAllowedAudience().toString());
-            List<org.wso2.carbon.identity.application.common.model.RoleV2> listOfRoles =
-                    associatedRolesConfig.getRoles().stream()
-                            .map(role -> new org.wso2.carbon.identity.application.common.model.RoleV2(role.getId()))
-                            .collect(Collectors.toList());
-            rolesConfig.setRoles(listOfRoles.toArray(new RoleV2[0]));
+            if (associatedRolesConfig.getRoles() != null) {
+                List<org.wso2.carbon.identity.application.common.model.RoleV2> listOfRoles =
+                        associatedRolesConfig.getRoles().stream()
+                                .map(role -> new org.wso2.carbon.identity.application.common.model.RoleV2(role.getId()))
+                                .collect(Collectors.toList());
+                rolesConfig.setRoles(listOfRoles.toArray(new RoleV2[0]));
+            }
         }
         serviceProvider.setAssociatedRolesConfig(rolesConfig);
     }