[jboss-cvs] JBossAS SVN: r83432 - projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins.

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

Author: anil.saldhana at jboss.com
Date: 2009-01-26 16:30:29 -0500 (Mon, 26 Jan 2009)
New Revision: 83432

Modified:
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java
Log:
SECURITY-346: handle the null rolegroup

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java	2009-01-26 21:29:00 UTC (rev 83431)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java	2009-01-26 21:30:29 UTC (rev 83432)
@@ -420,6 +420,10 @@
             contextMap.put(SecurityConstants.PRINCIPALS_SET_IDENTIFIER, subject.getPrincipals());
             if(trace)
                log.trace("Roles before mapping:"+ userRoles);
+            
+            if(userRoles == null)
+               userRoles = this.getEmptyRoleGroup();
+            
             mc.performMapping(contextMap, userRoles);
             mappedUserRoles = mc.getMappingResult().getMappedObject();
             if(trace)
@@ -448,7 +452,7 @@
       if(toCopy == null)
          return source;
       if(source == null && toCopy != null) 
-         source = new SimpleRoleGroup(SecurityConstants.ROLES_IDENTIFIER);
+         source = this.getEmptyRoleGroup();
       Enumeration<? extends Principal> en = toCopy.members();
       while(en.hasMoreElements())
       {
@@ -518,4 +522,9 @@
       if(resource.getMap() == null)
          throw new IllegalArgumentException("resource has null context map");
    }
+   
+   private RoleGroup getEmptyRoleGroup()
+   {
+      return new SimpleRoleGroup(SecurityConstants.ROLES_IDENTIFIER);
+   }
 }
\ No newline at end of file