================================================================================ 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_gf755_060713/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.34 Report generated at Thu Jul 13 16:31:04 2006 -------------------------------------------------------------------------------- *** /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java Thu Jul 13 16:31:03 2006 --- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf755_060713/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.34 Thu Jul 13 16:14:04 2006 *************** *** 580,583 **** --- 580,592 ---- public void joinTransaction(){ transaction.registerUnitOfWorkWithTxn(getActivePersistenceContext(checkForTransaction(true))); } + + /** + * + */ + protected void finalize() throws Throwable { + if(isOpen()) { + close(); + } + } } ================================================================================ 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_gf755_060713/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.34 Report generated at Thu Jul 13 16:31:26 2006 -------------------------------------------------------------------------------- *** /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java Thu Jul 13 16:31:03 2006 --- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf755_060713/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.34 Thu Jul 13 16:14:04 2006 *************** *** 580,583 **** --- 580,592 ---- public void joinTransaction(){ transaction.registerUnitOfWorkWithTxn(getActivePersistenceContext(checkForTransaction(true))); } + + /** + * + */ + protected void finalize() throws Throwable { + if(isOpen()) { + close(); + } + } }