[jboss-cvs] JBossAS SVN: r67122 - trunk/ejb3/src/main/org/jboss/ejb3/security.

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

Author: adrian at jboss.org
Date: 2007-11-15 06:24:03 -0500 (Thu, 15 Nov 2007)
New Revision: 67122

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java
Log:
[EJBTHREE-1067] - fix NPE when looking at non-existant runAsPrincipal

Modified: trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java	2007-11-15 11:14:13 UTC (rev 67121)
+++ trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java	2007-11-15 11:24:03 UTC (rev 67122)
@@ -62,7 +62,7 @@
       Set<String> extraRoles = new HashSet<String>();
       
       JBossAssemblyDescriptorMetaData ad = container.getAssemblyDescriptor();
-      if(ad != null)
+      if(ad != null && runAsPrincipal != null)
       {
          extraRoles.addAll(ad.getSecurityRoleNamesByPrincipal(runAsPrincipal));
       }