[openejb-scm] openejb/modules/core/src/java/org/openejb/entity EntityInterceptorBuilder.java

[maguro]

maguro      2004/07/26 22:27:04

  Modified:    modules/core/src/java/org/openejb/entity
                        EntityInterceptorBuilder.java
  Log:

  Update interceptor builder to reflect the "two-chain" changes.
  
  Revision  Changes    Path
  1.8       +7 -7      
openejb/modules/core/src/java/org/openejb/entity/EntityInterceptorBuilder.java
  
  Index: EntityInterceptorBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/entity/EntityInterceptorBuilder.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- EntityInterceptorBuilder.java     18 Jul 2004 22:32:20 -0000      1.7
  +++ EntityInterceptorBuilder.java     27 Jul 2004 02:27:04 -0000      1.8
  @@ -78,13 +78,9 @@
   
           Interceptor firstInterceptor;
           firstInterceptor = new DispatchInterceptor(vtable);
  -        if (setIdentityEnabled) {
  +        if (doAsCurrentCaller) {
               firstInterceptor = new EJBIdentityInterceptor(firstInterceptor);
           }
  -        firstInterceptor = new ComponentContextInterceptor(firstInterceptor, 
componentContext);
  -        if (trackedConnectionAssociator != null) {
  -            firstInterceptor = new ConnectionTrackingInterceptor(firstInterceptor, 
trackedConnectionAssociator);
  -        }
           Interceptor systemChain = firstInterceptor;
           if (securityEnabled) {
               firstInterceptor = new EJBSecurityInterceptor(firstInterceptor, 
containerId, permissionManager);
  @@ -92,8 +88,12 @@
           if (runAs != null) {
               firstInterceptor = new EJBRunAsInterceptor(firstInterceptor, runAs);
           }
  -        if (securityEnabled) {
  +        if (useContextHandler) {
               firstInterceptor = new 
PolicyContextHandlerEJBInterceptor(firstInterceptor);
  +        }
  +        firstInterceptor = new ComponentContextInterceptor(firstInterceptor, 
componentContext);
  +        if (trackedConnectionAssociator != null) {
  +            firstInterceptor = new ConnectionTrackingInterceptor(firstInterceptor, 
trackedConnectionAssociator);
           }
           firstInterceptor = new EntityInstanceInterceptor(firstInterceptor, 
instancePool);
           firstInterceptor = new TransactionContextInterceptor(firstInterceptor, 
transactionContextManager, transactionPolicyManager);