[jboss-cvs] JBossAS SVN: r66576 - projects/metadata/trunk/src/main/java/org/jboss/metadata.

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

Author: scott.stark at jboss.org
Date: 2007-10-30 13:15:24 -0400 (Tue, 30 Oct 2007)
New Revision: 66576

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/AssemblyDescriptorMetaData.java
Log:
JBAS-4922, Fix NPE in getPrincipalVersusRolesMap

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/AssemblyDescriptorMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/AssemblyDescriptorMetaData.java	2007-10-30 16:24:09 UTC (rev 66575)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/AssemblyDescriptorMetaData.java	2007-10-30 17:15:24 UTC (rev 66576)
@@ -118,11 +118,13 @@
       Map<String, Set<String>> principalRolesMap = null;
       
       Map<String, SecurityRoleMetaData> secroles = getSecurityRoles();
+      if(secroles != null)
       for(SecurityRoleMetaData srm : secroles.values())
       {
          String rolename = srm.getRoleName();
          if(principalRolesMap == null)
             principalRolesMap = new HashMap<String, Set<String>>();
+         if(srm.getPrincipals() != null)
          for(String pr : srm.getPrincipals())
          {
             Set<String> roleset = (Set<String>)principalRolesMap.get(pr);