[openejb-scm] openejb/modules/core/src/java/org/openejb/security EJBSecurityInterceptor.java

[djencks]

djencks     2005/04/18 15:05:11

  Modified:    modules/core/src/java/org/openejb/security
                        EJBSecurityInterceptor.java
  Log:

  GERONIMO-634 Policy context per ejb module, not per ejb
  
  Revision  Changes    Path
  1.10      +6 -6      
openejb/modules/core/src/java/org/openejb/security/EJBSecurityInterceptor.java
  
  Index: EJBSecurityInterceptor.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/security/EJBSecurityInterceptor.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- EJBSecurityInterceptor.java       16 Apr 2005 20:35:27 -0000      1.9
  +++ EJBSecurityInterceptor.java       18 Apr 2005 19:05:11 -0000      1.10
  @@ -71,14 +71,14 @@
    */
   public final class EJBSecurityInterceptor implements Interceptor {
       private final Interceptor next;
  -    private final String contextId;
  +    private final String policyContextID;
       private final PermissionManager permissionManager;
   
  -    public EJBSecurityInterceptor(Interceptor next, Object contextId, 
PermissionManager permissionManager) {
  +    public EJBSecurityInterceptor(Interceptor next, String policyContextID, 
PermissionManager permissionManager) {
           this.next = next;
           //TODO go back to the commented version when possible
  -//        this.contextId = contextId.toString();
  -        this.contextId = contextId.toString().replaceAll("[,: ]", "_");
  +        this.policyContextID = policyContextID;
  +//        this.policyContextID = policyContextID.toString().replaceAll("[,: 
]", "_");
           this.permissionManager = permissionManager;
       }
   
  @@ -91,7 +91,7 @@
           String oldPolicyContextID = PolicyContext.getContextID();
   
           try {
  -            PolicyContext.setContextID(contextId);
  +            PolicyContext.setContextID(policyContextID);
               AccessControlContext accessContext = 
ContextManager.getCurrentContext();
               if (accessContext != null) {
                   Permission permission = 
permissionManager.getPermission(ejbInvocation.getType(), 
ejbInvocation.getMethodIndex());