================================================================================ Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/platform/database/PostgreSQLPlatform.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf_1313_061017/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.7 Report generated at Tue Oct 17 10:03:21 2006 -------------------------------------------------------------------------------- *** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf_1313_061017/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.7 Tue Oct 17 09:57:33 2006 --- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/platform/database/PostgreSQLPlatform.java Tue Oct 17 10:03:21 2006 *************** *** 410,416 **** // Ensure that the entity uses sequencing if (descriptor.usesSequenceNumbers()) { String currSequenceName = descriptor.getSequenceNumberName(); ! sequence = (Sequence)getSequences().get(currSequenceName); boolean shouldVerifySequenceName; --- 410,416 ---- // Ensure that the entity uses sequencing if (descriptor.usesSequenceNumbers()) { String currSequenceName = descriptor.getSequenceNumberName(); ! sequence = getSequence(currSequenceName); boolean shouldVerifySequenceName; ================================================================================ Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/platform/database/PostgreSQLPlatform.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf_1313_061017/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.7 Report generated at Tue Oct 17 10:03:37 2006 -------------------------------------------------------------------------------- *** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf_1313_061017/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.7 Tue Oct 17 09:57:33 2006 --- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/platform/database/PostgreSQLPlatform.java Tue Oct 17 10:03:21 2006 *************** *** 410,416 **** // Ensure that the entity uses sequencing if (descriptor.usesSequenceNumbers()) { String currSequenceName = descriptor.getSequenceNumberName(); ! sequence = (Sequence)getSequences().get(currSequenceName); boolean shouldVerifySequenceName; --- 410,416 ---- // Ensure that the entity uses sequencing if (descriptor.usesSequenceNumbers()) { String currSequenceName = descriptor.getSequenceNumberName(); ! sequence = getSequence(currSequenceName); boolean shouldVerifySequenceName;