================================================================================
Merge Diffs: /ade/lhillis_main/tltest/source/essentials/oracle/toplink/essentials/testing/tests/cmp3/advanced/EMRemoveAndCommitTests.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf732_060714/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.6
Report generated at Fri Jul 14 15:26:58 2006
--------------------------------------------------------------------------------
*** /ade/lhillis_main/tltest/source/essentials/oracle/toplink/essentials/testing/tests/cmp3/advanced/EMRemoveAndCommitTests.java	Fri Jul 14 15:26:55 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf732_060714/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.6	Fri Jul 14 10:55:57 2006
***************
*** 120,126 ****
              commitTransaction();
          } catch (Exception ex) {
              rollbackTransaction();
!             throw new TestErrorException("Exception thrown during assignment of employee to a project" + ex);
          }
      }    
  
--- 120,126 ----
              commitTransaction();
          } catch (Exception ex) {
              rollbackTransaction();
!             throw new TestErrorException("Exception thrown durring assignment of employee to a project" + ex);
          }
      }    
  
================================================================================
Merge Diffs: /ade/lhillis_main/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/lhillis/lhillis_essentials_gf732_060714/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.41
Report generated at Fri Jul 14 15:26:58 2006
--------------------------------------------------------------------------------
*** /ade/lhillis_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/advanced/EntityManagerJUnitTestSuite.java	Fri Jul 14 15:26:58 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf732_060714/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.41	Fri Jul 14 15:26:43 2006
***************
*** 2237,2257 ****
          
          em.close();
      }
- 
- 	//bug gf732 - removing a null entity should throw an IllegalArgumentException
-     public void testEMRemoveNull(){
-         EntityManager em = createEntityManager();
-         em.getTransaction().begin();
-         try {
-         	em.remove(null);
-         	fail("IllegalArgumentException not thrown when entityManager.remove(null) attempted");
-         }catch (IllegalArgumentException iae){
-         	//should throw IllegalArgumentException, so do nothing
-         }finally {
-             em.getTransaction().rollback();
-             em.close();
-         }
-     }
      
      public static void main(String[] args) {
          // Now run JUnit.
--- 2237,2242 ----
================================================================================
Merge Diffs: /ade/lhillis_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf732_060714/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.35
Report generated at Fri Jul 14 15:26:58 2006
--------------------------------------------------------------------------------
*** /ade/lhillis_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java	Fri Jul 14 15:26:58 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf732_060714/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.35	Fri Jul 14 14:20:01 2006
***************
*** 192,204 ****
  	/**
  	* Remove the instance.
  	* @param entity
- 	* @throws IllegalArgumentException if Object passed in is not an entity
  	*/
  	public void remove(Object entity){
              verifyOpen();
- 			if (entity == null){ //gf732 - check for null
-             	throw new IllegalArgumentException(ExceptionLocalization.buildMessage("not_an_entity", new Object[] {entity}));
-             }
              try{
                  getActivePersistenceContext(checkForTransaction(!isExtended())).performRemove(entity, new IdentityHashtable());
              }catch (RuntimeException e){
--- 192,200 ----
================================================================================
Merge Diffs: /ade/lhillis_main/tltest/source/essentials/oracle/toplink/essentials/testing/tests/cmp3/advanced/EMRemoveAndCommitTests.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf732_060714/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.6
Report generated at Fri Jul 14 15:28:59 2006
--------------------------------------------------------------------------------
*** /ade/lhillis_main/tltest/source/essentials/oracle/toplink/essentials/testing/tests/cmp3/advanced/EMRemoveAndCommitTests.java	Fri Jul 14 15:26:55 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf732_060714/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.6	Fri Jul 14 10:55:57 2006
***************
*** 120,126 ****
              commitTransaction();
          } catch (Exception ex) {
              rollbackTransaction();
!             throw new TestErrorException("Exception thrown during assignment of employee to a project" + ex);
          }
      }    
  
--- 120,126 ----
              commitTransaction();
          } catch (Exception ex) {
              rollbackTransaction();
!             throw new TestErrorException("Exception thrown durring assignment of employee to a project" + ex);
          }
      }    
  
================================================================================
Merge Diffs: /ade/lhillis_main/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/lhillis/lhillis_essentials_gf732_060714/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.41
Report generated at Fri Jul 14 15:28:59 2006
--------------------------------------------------------------------------------
*** /ade/lhillis_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/advanced/EntityManagerJUnitTestSuite.java	Fri Jul 14 15:26:58 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf732_060714/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.41	Fri Jul 14 15:26:43 2006
***************
*** 2237,2257 ****
          
          em.close();
      }
- 
- 	//bug gf732 - removing a null entity should throw an IllegalArgumentException
-     public void testEMRemoveNull(){
-         EntityManager em = createEntityManager();
-         em.getTransaction().begin();
-         try {
-         	em.remove(null);
-         	fail("IllegalArgumentException not thrown when entityManager.remove(null) attempted");
-         }catch (IllegalArgumentException iae){
-         	//should throw IllegalArgumentException, so do nothing
-         }finally {
-             em.getTransaction().rollback();
-             em.close();
-         }
-     }
      
      public static void main(String[] args) {
          // Now run JUnit.
--- 2237,2242 ----
================================================================================
Merge Diffs: /ade/lhillis_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf732_060714/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.35
Report generated at Fri Jul 14 15:28:59 2006
--------------------------------------------------------------------------------
*** /ade/lhillis_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java	Fri Jul 14 15:26:58 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf732_060714/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.35	Fri Jul 14 14:20:01 2006
***************
*** 192,204 ****
  	/**
  	* Remove the instance.
  	* @param entity
- 	* @throws IllegalArgumentException if Object passed in is not an entity
  	*/
  	public void remove(Object entity){
              verifyOpen();
- 			if (entity == null){ //gf732 - check for null
-             	throw new IllegalArgumentException(ExceptionLocalization.buildMessage("not_an_entity", new Object[] {entity}));
-             }
              try{
                  getActivePersistenceContext(checkForTransaction(!isExtended())).performRemove(entity, new IdentityHashtable());
              }catch (RuntimeException e){
--- 192,200 ----