[jboss-cvs] JBossAS SVN: r62603 - trunk/server/src/main/org/jboss/ejb.

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

Author: thomas.diesler at jboss.com
Date: 2007-04-27 04:52:16 -0400 (Fri, 27 Apr 2007)
New Revision: 62603

Modified:
   trunk/server/src/main/org/jboss/ejb/SessionContainer.java
Log:
[JBAS-4317] Security Context over the invocation. Prevent IllegalStateException(Security Context in invocation is null)

Modified: trunk/server/src/main/org/jboss/ejb/SessionContainer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/SessionContainer.java	2007-04-27 08:46:11 UTC (rev 62602)
+++ trunk/server/src/main/org/jboss/ejb/SessionContainer.java	2007-04-27 08:52:16 UTC (rev 62603)
@@ -620,9 +620,9 @@
 
    public Object internalInvokeHome(Invocation mi) throws Exception
    {
-      //Validate that there is a security context on the invocation 
+      //Place on the invocation
       if(mi.getSecurityContext() == null)
-         throw new IllegalStateException("Security Context in invocation is null");
+         mi.setSecurityContext(SecurityActions.getSecurityContext());
        
       String securityDomain = SecurityConstants.DEFAULT_APPLICATION_POLICY;
       if(sm != null)
@@ -633,9 +633,6 @@
                  mi.getCredential(), securityDomain, null); 
       }
       SecurityActions.pushCallerRunAsIdentity(mi.getSecurityContext().getRunAs());
-      //Place on the invocation
-      if(mi.getSecurityContext() == null)
-         mi.setSecurityContext(SecurityActions.getSecurityContext());
       
       Method method = mi.getMethod();
       if (method != null && method.getName().equals("remove"))
@@ -672,9 +669,9 @@
     */
    public Object internalInvoke(Invocation mi) throws Exception
    { 
-      //Validate that there is a security context on the invocation 
+      //Place on the invocation
       if(mi.getSecurityContext() == null)
-         throw new IllegalStateException("Security Context in invocation is null");
+         mi.setSecurityContext(SecurityActions.getSecurityContext());
        
       String securityDomain = SecurityConstants.DEFAULT_APPLICATION_POLICY;
       if(sm != null)
@@ -685,9 +682,6 @@
                  mi.getCredential(), securityDomain, null); 
       }
       SecurityActions.pushCallerRunAsIdentity(mi.getSecurityContext().getRunAs());
-      //Place on the invocation
-      if(mi.getSecurityContext() == null)
-         mi.setSecurityContext(SecurityActions.getSecurityContext());
        
       try
       {