[jboss-cvs] JBossAS SVN: r66557 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

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

Author: scott.stark at jboss.org
Date: 2007-10-30 02:40:04 -0400 (Tue, 30 Oct 2007)
New Revision: 66557

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
Validate role names for null

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2007-10-30 06:36:24 UTC (rev 66556)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2007-10-30 06:40:04 UTC (rev 66557)
@@ -232,9 +232,10 @@
        		constraint.setAuthConstraint(acmd != null);
        		if (acmd != null)
             {
-       			Iterator<String> roles = acmd.getRoleNames().iterator();
-       			while (roles.hasNext()) {
-       				constraint.addAuthRole(roles.next());
+               if(acmd.getRoleNames() != null)
+       			for(String role : acmd.getRoleNames())
+               {
+       				constraint.addAuthRole(role);
        			}
        		}
             WebResourceCollectionsMetaData wrcs = value.getResourceCollections();