================================================================================
Merge Diffs: /ade/gyorke_ref-essentials/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/RepeatableWriteUnitOfWork.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gyorke/gyorke_fix-uow-in-txn-does-not-use-shared-cache_060719/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.20
Report generated at Thu Jul 20 14:11:57 2006
--------------------------------------------------------------------------------
*** /ade/gyorke_ref-essentials/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/RepeatableWriteUnitOfWork.java	Thu Jul 20 14:11:57 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gyorke/gyorke_fix-uow-in-txn-does-not-use-shared-cache_060719/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.20	Wed Jul 19 16:11:53 2006
***************
*** 227,238 ****
              }
              calculateChanges(allObjectsList, (UnitOfWorkChangeSet)getUnitOfWorkChangeSet());
              // write those changes to the database.
-             UnitOfWorkChangeSet changeSet = (UnitOfWorkChangeSet)getUnitOfWorkChangeSet();
-             if (!changeSet.hasChanges() && !changeSet.hasForcedChanges() && ! this.hasDeletedObjects() && ! this.hasModifyAllQueries()){
-             	return;
-             }
              try {
!                 commitToDatabaseWithPreBuiltChangeSet(changeSet, false);
                  this.writesCompleted();
              } catch (RuntimeException ex) {
                  setLifecycle(WriteChangesFailed);
--- 227,234 ----
              }
              calculateChanges(allObjectsList, (UnitOfWorkChangeSet)getUnitOfWorkChangeSet());
              // write those changes to the database.
              try {
!                 commitToDatabaseWithPreBuiltChangeSet((UnitOfWorkChangeSet)getUnitOfWorkChangeSet(), false);
                  this.writesCompleted();
              } catch (RuntimeException ex) {
                  setLifecycle(WriteChangesFailed);
================================================================================
Merge Diffs: /ade/gyorke_ref-essentials/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/advanced/EntityManagerJUnitTestSuite.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gyorke/gyorke_fix-uow-in-txn-does-not-use-shared-cache_060719/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.43
Report generated at Thu Jul 20 14:11:57 2006
--------------------------------------------------------------------------------
*** /ade/gyorke_ref-essentials/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/advanced/EntityManagerJUnitTestSuite.java	Thu Jul 20 14:11:57 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gyorke/gyorke_fix-uow-in-txn-does-not-use-shared-cache_060719/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.43	Thu Jul 20 14:02:44 2006
***************
*** 158,173 ****
          }
      }
  
-     public void testCacheUsage(){
-     	clearCache();
-         EntityManager em = createEntityManager();
-         em.getTransaction().begin();
-         List result = em.createQuery("SELECT OBJECT(e) FROM Employee e").getResultList();
-         em.getTransaction().commit();
-         Object obj = ((oracle.toplink.essentials.ejb.cmp3.EntityManager)em).getServerSession().getIdentityMapAccessor().getFromIdentityMap(result.get(0));
-         assertTrue("Failed to load the object into the shared cache when there were no changes in the UOW", obj != null);
-     }
-     
      public void testContainsRemoved() {
          // find an existing or create a new Employee
          String firstName = "testContainsRemoved";
--- 158,163 ----
================================================================================
Merge Diffs: /ade/gyorke_ref-essentials/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/RepeatableWriteUnitOfWork.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gyorke/gyorke_fix-uow-in-txn-does-not-use-shared-cache_060719/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.20
Report generated at Thu Jul 20 14:25:38 2006
--------------------------------------------------------------------------------
*** /ade/gyorke_ref-essentials/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/RepeatableWriteUnitOfWork.java	Thu Jul 20 14:25:34 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gyorke/gyorke_fix-uow-in-txn-does-not-use-shared-cache_060719/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.20	Wed Jul 19 16:11:53 2006
***************
*** 227,238 ****
              }
              calculateChanges(allObjectsList, (UnitOfWorkChangeSet)getUnitOfWorkChangeSet());
              // write those changes to the database.
-             UnitOfWorkChangeSet changeSet = (UnitOfWorkChangeSet)getUnitOfWorkChangeSet();
-             if (!changeSet.hasChanges() && !changeSet.hasForcedChanges() && ! this.hasDeletedObjects() && ! this.hasModifyAllQueries()){
-             	return;
-             }
              try {
!                 commitToDatabaseWithPreBuiltChangeSet(changeSet, false);
                  this.writesCompleted();
              } catch (RuntimeException ex) {
                  setLifecycle(WriteChangesFailed);
--- 227,234 ----
              }
              calculateChanges(allObjectsList, (UnitOfWorkChangeSet)getUnitOfWorkChangeSet());
              // write those changes to the database.
              try {
!                 commitToDatabaseWithPreBuiltChangeSet((UnitOfWorkChangeSet)getUnitOfWorkChangeSet(), false);
                  this.writesCompleted();
              } catch (RuntimeException ex) {
                  setLifecycle(WriteChangesFailed);
================================================================================
Merge Diffs: /ade/gyorke_ref-essentials/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/advanced/EntityManagerJUnitTestSuite.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gyorke/gyorke_fix-uow-in-txn-does-not-use-shared-cache_060719/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.44
Report generated at Thu Jul 20 14:25:38 2006
--------------------------------------------------------------------------------
*** /ade/gyorke_ref-essentials/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/advanced/EntityManagerJUnitTestSuite.java	Thu Jul 20 14:25:38 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gyorke/gyorke_fix-uow-in-txn-does-not-use-shared-cache_060719/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.44	Thu Jul 20 14:25:30 2006
***************
*** 155,170 ****
          }
      }
  
-     public void testCacheUsage(){
-     	clearCache();
-         EntityManager em = createEntityManager();
-         em.getTransaction().begin();
-         List result = em.createQuery("SELECT OBJECT(e) FROM Employee e").getResultList();
-         em.getTransaction().commit();
-         Object obj = ((oracle.toplink.essentials.ejb.cmp3.EntityManager)em).getServerSession().getIdentityMapAccessor().getFromIdentityMap(result.get(0));
-         assertTrue("Failed to load the object into the shared cache when there were no changes in the UOW", obj != null);
-     }
-     
      public void testContainsRemoved() {
          // find an existing or create a new Employee
          String firstName = "testContainsRemoved";
--- 155,160 ----