================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf_1771/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.44
Report generated at Tue Dec 19 18:26:40 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf_1771/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.44	Tue Dec 19 17:20:41 2006
--- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java	Tue Dec 19 18:26:40 2006
***************
*** 160,176 ****
      */
      public void clearInternal(){
          if (this.isExtended()){
!             if (this.extendedPersistenceContext != null) {
!                 if (checkForTransaction(false) != null){
!                     this.extendedPersistenceContext.clear();
!                     
!                     if (this.extendedPersistenceContext.getParent() instanceof IsolatedClientSession) {
!                         this.extendedPersistenceContext.getParent().getIdentityMapAccessor().initializeIdentityMaps();
!                     }
!                 }else{
!                     this.extendedPersistenceContext = null;
!                 }
              }
          } else {
              transaction.clear();
          }
--- 160,174 ----
      */
      public void clearInternal(){
          if (this.isExtended()){
!             this.extendedPersistenceContext.clear();
!             
!             if (this.extendedPersistenceContext.getParent() instanceof IsolatedClientSession) {
!                 this.extendedPersistenceContext.getParent().getIdentityMapAccessor().initializeIdentityMaps();
              }
+             if (checkForTransaction(false) == null){
+                 this.extendedPersistenceContext = null;
+             }
+ 
          } else {
              transaction.clear();
          }
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf_1771/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.44
Report generated at Tue Dec 19 18:27:19 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf_1771/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.44	Tue Dec 19 17:20:41 2006
--- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java	Tue Dec 19 18:26:40 2006
***************
*** 160,176 ****
      */
      public void clearInternal(){
          if (this.isExtended()){
!             if (this.extendedPersistenceContext != null) {
!                 if (checkForTransaction(false) != null){
!                     this.extendedPersistenceContext.clear();
!                     
!                     if (this.extendedPersistenceContext.getParent() instanceof IsolatedClientSession) {
!                         this.extendedPersistenceContext.getParent().getIdentityMapAccessor().initializeIdentityMaps();
!                     }
!                 }else{
!                     this.extendedPersistenceContext = null;
!                 }
              }
          } else {
              transaction.clear();
          }
--- 160,174 ----
      */
      public void clearInternal(){
          if (this.isExtended()){
!             this.extendedPersistenceContext.clear();
!             
!             if (this.extendedPersistenceContext.getParent() instanceof IsolatedClientSession) {
!                 this.extendedPersistenceContext.getParent().getIdentityMapAccessor().initializeIdentityMaps();
              }
+             if (checkForTransaction(false) == null){
+                 this.extendedPersistenceContext = null;
+             }
+ 
          } else {
              transaction.clear();
          }