[jboss-cvs] JBossAS SVN: r66122 - trunk/tomcat/src/main/org/jboss/web/tomcat/security.

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

Author: jfrederic.clere at jboss.com
Date: 2007-10-15 05:44:21 -0400 (Mon, 15 Oct 2007)
New Revision: 66122

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java
Log:
Prevent a java.lang.NullPointerException.


Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java	2007-10-15 09:25:18 UTC (rev 66121)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java	2007-10-15 09:44:21 UTC (rev 66122)
@@ -115,15 +115,16 @@
             {
                String name = servlet.getName();
                SecurityRoleMetaData identity = metaData.getRunAsIdentity(name);
+               RunAsIdentity runAs = null;
                if (identity != null)
                {
                   if (trace)
                      log.trace(name + ", runAs: " + identity);
+                  String principalName = identity.getPrincipalName();
+                  if (principalName == null)
+                     principalName = identity.getRoleName();
+                  runAs = new RunAsIdentity(identity.getRoleName(), principalName, identity.getPrincipals());
                }
-               String principalName = identity.getPrincipalName();
-               if (principalName == null)
-                  principalName = identity.getRoleName();
-               RunAsIdentity runAs = new RunAsIdentity(identity.getRoleName(), principalName, identity.getPrincipals());
                SecurityAssociationActions.pushRunAsIdentity(runAs); 
             }
             userPrincipal.set(caller);