[openejb-scm] openejb/modules/core/src/java/org/openejb/mdb MDBInterceptorBuilder.java

[maguro]

maguro      2004/07/26 22:26:42

  Modified:    modules/core/src/java/org/openejb/mdb
                        MDBInterceptorBuilder.java
  Log:

  Update interceptor builder to reflect the "two-chain" changes.
  
  Revision  Changes    Path
  1.4       +6 -13     
openejb/modules/core/src/java/org/openejb/mdb/MDBInterceptorBuilder.java
  
  Index: MDBInterceptorBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/mdb/MDBInterceptorBuilder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MDBInterceptorBuilder.java        18 Jul 2004 22:32:23 -0000      1.3
  +++ MDBInterceptorBuilder.java        27 Jul 2004 02:26:42 -0000      1.4
  @@ -71,7 +71,7 @@
       private VirtualOperation[] vtable;
       private Subject runAs;
       private ReadOnlyContext componentContext;
  -    private boolean setIdentityEnabled = false;
  +    private boolean doAsCurrentCaller = false;
       private transient TrackedConnectionAssociator trackedConnectionAssociator;
       private transient InstancePool instancePool;
   
  @@ -94,8 +94,8 @@
           this.componentContext = componentContext;
       }
   
  -    public void setSetIdentityEnabled(boolean setIdentityEnabled) {
  -        this.setIdentityEnabled = setIdentityEnabled;
  +    public void setDoAsCurrentCaller(boolean doAsCurrentCaller) {
  +        this.doAsCurrentCaller = doAsCurrentCaller;
       }
   
       public void setTrackedConnectionAssociator(TrackedConnectionAssociator 
trackedConnectionAssociator) {
  @@ -116,24 +116,17 @@
   
           Interceptor firstInterceptor;
           firstInterceptor = new DispatchInterceptor(vtable);
  -        if (setIdentityEnabled) {
  +        firstInterceptor = new ComponentContextInterceptor(firstInterceptor, 
componentContext);
  +        if (doAsCurrentCaller) {
               firstInterceptor = new EJBIdentityInterceptor(firstInterceptor);
           }
  -        firstInterceptor = new ComponentContextInterceptor(firstInterceptor, 
componentContext);
           Interceptor systemChain = firstInterceptor;
           if (trackedConnectionAssociator != null) {
               firstInterceptor = new ConnectionTrackingInterceptor(firstInterceptor, 
trackedConnectionAssociator);
           }
           // firstInterceptor = new TransactionContextInterceptor(firstInterceptor, 
transactionContextManager, transactionPolicyManager);
   
  -        if (runAs != null) {
  -            firstInterceptor = new EJBRunAsInterceptor(firstInterceptor, runAs);
  -        }
   
  -        // todo Alan do we need this?
  -        // if (securityEnabled) {
  -        //     firstInterceptor = new 
PolicyContextHandlerEJBInterceptor(firstInterceptor);
  -        // }
           firstInterceptor = new MDBInstanceInterceptor(firstInterceptor, 
instancePool);
           firstInterceptor = new SystemExceptionInterceptor(firstInterceptor, 
ejbName);
           return new TwoChains(firstInterceptor, systemChain);