[jboss-cvs] JBossAS SVN: r110377 - projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/auth/spi.

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

Author: mmoyses
Date: 2011-01-14 11:50:41 -0500 (Fri, 14 Jan 2011)
New Revision: 110377

Modified:
   projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/auth/spi/RoleMappingLoginModule.java
Log:
SECURITY-554: fixing NPE

Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/auth/spi/RoleMappingLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/auth/spi/RoleMappingLoginModule.java	2011-01-14 16:44:33 UTC (rev 110376)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/auth/spi/RoleMappingLoginModule.java	2011-01-14 16:50:41 UTC (rev 110377)
@@ -165,10 +165,13 @@
          String roleKey = (String)enumer.nextElement();
          String comma_separated_roles = props.getProperty(roleKey);
          Principal pIdentity = createIdentity(roleKey);
-         if(group.isMember(pIdentity))
-            Util.parseGroupMembers(group,comma_separated_roles,this);
-         if(REPLACE_ROLE)
-            group.removeMember(pIdentity); 
+         if (group != null)
+         {
+            if(group.isMember(pIdentity))
+               Util.parseGroupMembers(group,comma_separated_roles,this);
+            if(REPLACE_ROLE)
+               group.removeMember(pIdentity);
+         }
       } 
    }
-}
\ No newline at end of file
+}