User: starksm Date: 01/06/12 21:49:58 Modified: src/main/org/jboss/ejb/plugins SecurityProxyInterceptor.java Log: Move the container interceptor code back into ContainerFactory and add the custom security proxy interceptor if a security proxy has been configured. Revision Changes Path 1.2 +6 -2 jboss/src/main/org/jboss/ejb/plugins/SecurityProxyInterceptor.java Index: SecurityProxyInterceptor.java =================================================================== RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/SecurityProxyInterceptor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SecurityProxyInterceptor.java 2001/06/11 07:04:15 1.1 +++ SecurityProxyInterceptor.java 2001/06/13 04:49:58 1.2 @@ -14,6 +14,7 @@ import org.jboss.ejb.Container; import org.jboss.ejb.ContainerInvokerContainer; +import org.jboss.ejb.EnterpriseContext; import org.jboss.ejb.MethodInvocation; import org.jboss.security.EJBSecurityManager; @@ -27,7 +28,7 @@ interceptor has access to the EJB instance and context. @author [EMAIL PROTECTED] -@version $Revision: 1.1 $ +@version $Revision: 1.2 $ */ public class SecurityProxyInterceptor extends AbstractInterceptor { @@ -117,7 +118,10 @@ // Apply any custom security checks if( securityProxy != null ) { - EJBContext ctx = mi.getEnterpriseContext().getEJBContext(); + EJBContext ctx = null; + EnterpriseContext ectx = mi.getEnterpriseContext(); + if( ectx != null ) + ctx = ectx.getEJBContext(); Object[] args = mi.getArguments(); securityProxy.setEJBContext(ctx); try _______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development