================================================================================
Merge Diffs: /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_5394392_entity_manager_close_060720/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.37
Report generated at Thu Jul 20 11:14:24 2006
--------------------------------------------------------------------------------
*** /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java	Thu Jul 20 11:14:24 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_5394392_entity_manager_close_060720/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.37	Thu Jul 20 10:37:59 2006
***************
*** 444,451 ****
      
  
     	/**
! 	 * <p>Closes this EntityManager.
!      * 
  	 * <p>After invoking this method, all methods on the instance will throw an
  	 * {@link IllegalStateException} except for {@link #isOpen}, which will return
  	 * <code>false</code>   .</p>
--- 444,455 ----
      
  
     	/**
! 	 * <p>Closes this EntityManager. If called when the transaction that this	
! 	 * EntityManager is associated with has a status of
! 	 * {@link Status#STATUS_NO_TRANSACTION}, {@link Status#Status_COMMITTED}
! 	 * or {@link Status#STATUS_ROLLEDBACK} then EntityManager closes immediately.
!      * Otherwise EntityManager still could be used until the transaction completes.</p>
! 	 *
  	 * <p>After invoking this method, all methods on the instance will throw an
  	 * {@link IllegalStateException} except for {@link #isOpen}, which will return
  	 * <code>false</code>   .</p>
***************
*** 459,465 ****
          verifyOpen();
          isOpen = false;
          try {
!             if (!transaction.shouldClose()){
                  this.transaction.markLastTransaction();
              }
          } finally {
--- 463,481 ----
          verifyOpen();
          isOpen = false;
          try {
!             if (transaction.shouldClose()){
!                 if (this.isExtended()){
!                     if (this.extendedPersistenceContext != null) {
!                         this.extendedPersistenceContext.release();
!                         this.extendedPersistenceContext.getParent().release();
!                     }
!                 }
!             } else {
!                 if (this.isExtended()){
!                     if (this.extendedPersistenceContext != null) {
!                         this.extendedPersistenceContext.setResumeUnitOfWorkOnTransactionCompletion(false);
!                     }
!                 }
                  this.transaction.markLastTransaction();
              }
          } finally {
================================================================================
Merge Diffs: /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_5394392_entity_manager_close_060720/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.37
Report generated at Thu Jul 20 11:37:53 2006
--------------------------------------------------------------------------------
*** /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java	Thu Jul 20 11:14:24 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_5394392_entity_manager_close_060720/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.37	Thu Jul 20 10:37:59 2006
***************
*** 444,451 ****
      
  
     	/**
! 	 * <p>Closes this EntityManager.
!      * 
  	 * <p>After invoking this method, all methods on the instance will throw an
  	 * {@link IllegalStateException} except for {@link #isOpen}, which will return
  	 * <code>false</code>   .</p>
--- 444,455 ----
      
  
     	/**
! 	 * <p>Closes this EntityManager. If called when the transaction that this	
! 	 * EntityManager is associated with has a status of
! 	 * {@link Status#STATUS_NO_TRANSACTION}, {@link Status#Status_COMMITTED}
! 	 * or {@link Status#STATUS_ROLLEDBACK} then EntityManager closes immediately.
!      * Otherwise EntityManager still could be used until the transaction completes.</p>
! 	 *
  	 * <p>After invoking this method, all methods on the instance will throw an
  	 * {@link IllegalStateException} except for {@link #isOpen}, which will return
  	 * <code>false</code>   .</p>
***************
*** 459,465 ****
          verifyOpen();
          isOpen = false;
          try {
!             if (!transaction.shouldClose()){
                  this.transaction.markLastTransaction();
              }
          } finally {
--- 463,481 ----
          verifyOpen();
          isOpen = false;
          try {
!             if (transaction.shouldClose()){
!                 if (this.isExtended()){
!                     if (this.extendedPersistenceContext != null) {
!                         this.extendedPersistenceContext.release();
!                         this.extendedPersistenceContext.getParent().release();
!                     }
!                 }
!             } else {
!                 if (this.isExtended()){
!                     if (this.extendedPersistenceContext != null) {
!                         this.extendedPersistenceContext.setResumeUnitOfWorkOnTransactionCompletion(false);
!                     }
!                 }
                  this.transaction.markLastTransaction();
              }
          } finally {