[jboss-cvs] JBossAS SVN: r111393 - branches/JBPAPP_5_1_0_Final_JBPAPP-6546/server/src/main/org/jboss/ejb/plugins/security.

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

Author: dehort
Date: 2011-05-17 17:47:23 -0400 (Tue, 17 May 2011)
New Revision: 111393

Modified:
   branches/JBPAPP_5_1_0_Final_JBPAPP-6546/server/src/main/org/jboss/ejb/plugins/security/PreSecurityInterceptor.java
Log:
Fixing a NPE exception that is raised when a thread with no security context invokes
the local interface of a secure EJB 2 bean.
[JBPAPP-6546]


Modified: branches/JBPAPP_5_1_0_Final_JBPAPP-6546/server/src/main/org/jboss/ejb/plugins/security/PreSecurityInterceptor.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-6546/server/src/main/org/jboss/ejb/plugins/security/PreSecurityInterceptor.java	2011-05-17 21:28:21 UTC (rev 111392)
+++ branches/JBPAPP_5_1_0_Final_JBPAPP-6546/server/src/main/org/jboss/ejb/plugins/security/PreSecurityInterceptor.java	2011-05-17 21:47:23 UTC (rev 111393)
@@ -115,7 +115,16 @@
            si = SecurityActions.getSecurityIdentity(sc);
            incomingDomain = sc.getSecurityDomain();
          }
-         
+         else
+         {
+           // The security context is null...create a new one
+           sc = SecurityActions.createAndSetSecurityContext(securityDomain,
+                                             container.getSecurityContextClassName());
+
+           // Get the security identity...creating a new one if needed
+           si = SecurityActions.getSecurityIdentity(sc);
+         }
+ 
          SecurityActions.setSecurityManagement(sc, container.getSecurityManagement());
          // set the container's security domain in the security context
          SecurityActions.setSecurityDomain(sc, this.securityDomain);