[jboss-cvs] JBossAS SVN: r114787 - projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/mapping/providers.

[jboss-cvs-commits at lists.jboss.org]

Author: soul2zimate
Date: 2014-03-27 06:32:56 -0400 (Thu, 27 Mar 2014)
New Revision: 114787

Modified:
   projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/mapping/providers/DeploymentRoleToRolesMappingProvider.java
Log:
SECURITY-811, Don't process role-roles mapping if assignedRoles RoleGroup is null

Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/mapping/providers/DeploymentRoleToRolesMappingProvider.java
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/mapping/providers/DeploymentRoleToRolesMappingProvider.java	2014-03-27 09:29:58 UTC (rev 114786)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/mapping/providers/DeploymentRoleToRolesMappingProvider.java	2014-03-27 10:32:56 UTC (rev 114787)
@@ -93,25 +93,29 @@
       RoleGroup newRoles = new SimpleRoleGroup(SecurityConstants.ROLES_IDENTIFIER);
       
       RoleGroup assignedRoles = (SimpleRoleGroup)contextMap.get(SecurityConstants.ROLES_IDENTIFIER);
-      
-      for (Role r: assignedRoles.getRoles()) {
 
-         boolean mappedRoleIncluded = false;
-         for (String mappedRole: roleToRolesMap.keySet()) {
-            if (roleToRolesMap.get(mappedRole).contains(r.getRoleName())) {
-               newRoles.addRole(new SimpleRole(mappedRole));
-               mappedRoleIncluded = true;
+      if(assignedRoles != null){      
+         for (Role r: assignedRoles.getRoles()) {
+
+            boolean mappedRoleIncluded = false;
+            for (String mappedRole: roleToRolesMap.keySet()) {
+               if (roleToRolesMap.get(mappedRole).contains(r.getRoleName())) {
+                  newRoles.addRole(new SimpleRole(mappedRole));
+                  mappedRoleIncluded = true;
+               }
             }
-         }
          
-         if (!mappedRoleIncluded) {
-            newRoles.addRole(r);
+            if (!mappedRoleIncluded) {
+               newRoles.addRole(r);
+            }
+         
          }
-         
       }
 
-      mappedObject.clearRoles();
-      mappedObject.addAll(newRoles.getRoles()); 
+      if(assignedRoles != null){
+         mappedObject.clearRoles();
+         mappedObject.addAll(newRoles.getRoles());
+      } 
       result.setMappedObject(mappedObject);
       
    } 
@@ -127,4 +131,4 @@
       return false;
    }
 
-}
\ No newline at end of file
+}