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

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

Author: wolfc
Date: 2006-12-06 10:43:35 -0500 (Wed, 06 Dec 2006)
New Revision: 58867

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java
Log:
fixed NPEs

Modified: trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java	2006-12-06 15:34:00 UTC (rev 58866)
+++ trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java	2006-12-06 15:43:35 UTC (rev 58867)
@@ -66,12 +66,16 @@
       else
       {
          //Check if jboss.xml has it  
-         runAsPrincipal = container.getXml().getSecurityIdentity().getRunAsPrincipal();
+         if(container.getXml() != null && container.getXml().getSecurityIdentity() != null)
+         {
+            runAsPrincipal = container.getXml().getSecurityIdentity().getRunAsPrincipal();
+         }
       }
 
       HashSet extraRoles = new HashSet();  
       AssemblyDescriptor ad = container.getAssemblyDescriptor();
-      extraRoles.addAll(ad.getSecurityRolesGivenPrincipal(runAsPrincipal));
+      if(ad != null)
+         extraRoles.addAll(ad.getSecurityRolesGivenPrincipal(runAsPrincipal));
 
       return new RunAsIdentity(runAs.value(), runAsPrincipal, extraRoles);
    }