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

[dain]

dain        2004/04/11 01:55:25

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

  Added cmp-field support
  
  Revision  Changes    Path
  1.3       +6 -5      
openejb/modules/core/src/java/org/openejb/entity/EntityInstanceInterceptor.java
  
  Index: EntityInstanceInterceptor.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/entity/EntityInstanceInterceptor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EntityInstanceInterceptor.java    21 Mar 2004 21:26:34 -0000      1.2
  +++ EntityInstanceInterceptor.java    11 Apr 2004 05:55:25 -0000      1.3
  @@ -49,15 +49,16 @@
   
   import javax.ejb.EntityBean;
   
  -import org.openejb.EJBInvocation;
  -import org.openejb.EJBOperation;
  -import org.openejb.cache.InstancePool;
   import org.apache.geronimo.core.service.Interceptor;
   import org.apache.geronimo.core.service.Invocation;
   import org.apache.geronimo.core.service.InvocationResult;
   import org.apache.geronimo.transaction.InstanceContext;
   import org.apache.geronimo.transaction.TransactionContext;
   
  +import org.openejb.EJBInvocation;
  +import org.openejb.EJBOperation;
  +import org.openejb.cache.InstancePool;
  +
   /**
    * Simple Instance Interceptor that does not cache instances in the ready state
    * but passivates between each invocation.
  @@ -81,6 +82,7 @@
           EntityInstanceContext context = (EntityInstanceContext) pool.acquire();
   
           EntityBean instance = (EntityBean) context.getInstance();
  +        context.setTransactionContext(transactionContext);
           if (id != null) {
               // always activate on the way in....
               context.setId(id);
  @@ -96,7 +98,6 @@
               }
   
               // associate this instance with the TransactionContext
  -            context.setTransactionContext(transactionContext);
               transactionContext.associate(context);
           }