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

[gdamour]

gdamour     2005/03/04 22:23:16

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

  Replace ',' with '_' to reflect the ContainerSecurityBuilder behavior.
  
  Revision  Changes    Path
  1.7       +6 -4      
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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- EJBSecurityInterceptor.java       27 Feb 2005 04:38:41 -0000      1.6
  +++ EJBSecurityInterceptor.java       5 Mar 2005 03:23:16 -0000       1.7
  @@ -70,12 +70,14 @@
    */
   public final class EJBSecurityInterceptor implements Interceptor {
       private final Interceptor next;
  -    private final Object contextId;
  +    private final String contextId;
       private final PermissionManager permissionManager;
   
       public EJBSecurityInterceptor(Interceptor next, Object contextId, 
PermissionManager permissionManager) {
           this.next = next;
  -        this.contextId = contextId;
  +        //TODO go back to the commented version when possible
  +//        this.contextId = contextId.toString();
  +        this.contextId = contextId.toString().replaceAll("[, ]", "_");
           this.permissionManager = permissionManager;
       }
   
  @@ -85,7 +87,7 @@
           Subject subject = ContextManager.getCurrentCaller();
           String oldPolicyContextID = PolicyContext.getContextID();
           try {
  -            PolicyContext.setContextID(contextId.toString());
  +            PolicyContext.setContextID(contextId);
               AccessControlContext accessContext = 
ContextManager.getCurrentContext();
               if (accessContext != null) {
                   Permission permission = 
permissionManager.getPermission(ejbInvocation.getType(), 
ejbInvocation.getMethodIndex());