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

[dain]

dain        2005/02/12 13:44:00

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

  Check for an already exisitng ejb context in the transaction context before 
createing a new one.  This eliminates an AssertionError thrown from reentrant 
calls.
  
  Revision  Changes    Path
  1.2       +2 -2      
openejb/modules/core/src/java/org/openejb/entity/cmp/CMPEntityInterceptorBuilder.java
  
  Index: CMPEntityInterceptorBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/entity/cmp/CMPEntityInterceptorBuilder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CMPEntityInterceptorBuilder.java  7 Nov 2004 08:04:27 -0000       1.1
  +++ CMPEntityInterceptorBuilder.java  12 Feb 2005 18:44:00 -0000      1.2
  @@ -113,7 +113,7 @@
           if (trackedConnectionAssociator != null) {
               firstInterceptor = new 
ConnectionTrackingInterceptor(firstInterceptor, trackedConnectionAssociator);
           }
  -        firstInterceptor = new EntityInstanceInterceptor(firstInterceptor, 
instancePool);
  +        firstInterceptor = new EntityInstanceInterceptor(firstInterceptor, 
containerId, instancePool);
           firstInterceptor = new InTxCacheInterceptor(firstInterceptor, 
strategyFactory);
           firstInterceptor = new 
TransactionContextInterceptor(firstInterceptor, transactionContextManager, 
transactionPolicyManager);
           firstInterceptor = new SystemExceptionInterceptor(firstInterceptor, 
ejbName);