[jboss-cvs] JBossAS SVN: r57802 - branches/JEE5_TCK/server/src/main/org/jboss/ejb/plugins

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

Author: anil.saldhana at jboss.com
Date: 2006-10-24 13:12:40 -0400 (Tue, 24 Oct 2006)
New Revision: 57802

Modified:
   branches/JEE5_TCK/server/src/main/org/jboss/ejb/plugins/SecurityInterceptor.java
Log:
clear security context

Modified: branches/JEE5_TCK/server/src/main/org/jboss/ejb/plugins/SecurityInterceptor.java
===================================================================
--- branches/JEE5_TCK/server/src/main/org/jboss/ejb/plugins/SecurityInterceptor.java	2006-10-24 17:12:17 UTC (rev 57801)
+++ branches/JEE5_TCK/server/src/main/org/jboss/ejb/plugins/SecurityInterceptor.java	2006-10-24 17:12:40 UTC (rev 57802)
@@ -33,6 +33,7 @@
 import org.jboss.security.RunAsIdentity;
 import org.jboss.security.SecurityConstants;  
 import org.jboss.security.SecurityContext;
+import org.jboss.security.SimpleGroup;
 import org.jboss.security.SecurityContext.SubjectInfo;
 import org.jboss.security.audit.AuditContext;
 import org.jboss.security.audit.AuditEvent;
@@ -46,6 +47,7 @@
 
 import java.security.CodeSource;
 import java.security.Principal;
+import java.security.acl.Group;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -179,6 +181,8 @@
       { 
          SecurityActions.popRunAsIdentity(); 
          SecurityActions.popSubjectContext();
+         //Clear the SecurityContext
+         SecurityActions.clearSecurityContext(appSecurityDomain);
       }
    }
 
@@ -203,6 +207,8 @@
       {  
          SecurityActions.popRunAsIdentity(); 
          SecurityActions.popSubjectContext();
+         //Clear the SecurityContext
+         SecurityActions.clearSecurityContext(appSecurityDomain);
       }
    }
    
@@ -288,7 +294,7 @@
      map.put(ResourceKeys.CALLER_SUBJECT, caller);
      map.put(ResourceKeys.AUTHORIZATION_MANAGER,authorizationManager); 
      map.put(ResourceKeys.RUNASIDENTITY, callerRunAsIdentity);
-     map.put(ResourceKeys.EJB_METHODROLES, container.getMethodPermissions(ejbMethod, mi.getType()));
+     map.put(ResourceKeys.EJB_METHODROLES, container.getMethodPermissions(ejbMethod, mi.getType())); 
      EJBResource ejbResource = new EJBResource(map); 
      boolean isAuthorized = false;
      try
@@ -397,5 +403,5 @@
      si.setAuthenticationPrincipal(p);
      jsc.setSubjectInfo(si); 
      SecurityActions.setSecurityContext(jsc, domain);
-  }
+  } 
 }