[hibernate-commits] Hibernate SVN: r15724 - in core/branches/Branch_3_2/test/org/hibernate/test: tm and 1 other directory.
Author: gbadner
Date: 2008-12-22 18:28:32 -0500 (Mon, 22 Dec 2008)
New Revision: 15724
Modified:
core/branches/Branch_3_2/test/org/hibernate/test/connections/AggressiveReleaseTest.java
core/branches/Branch_3_2/test/org/hibernate/test/tm/CMTTest.java
Log:
HHH-3675 - Limitations on Sybase ResultSet implementation causes unit test failures
Modified:
core/branches/Branch_3_2/test/org/hibernate/test/connections/AggressiveReleaseTest.java
===================================================================
---
core/branches/Branch_3_2/test/org/hibernate/test/connections/AggressiveReleaseTest.java 2008-12-22
23:27:26 UTC (rev 15723)
+++
core/branches/Branch_3_2/test/org/hibernate/test/connections/AggressiveReleaseTest.java 2008-12-22
23:28:32 UTC (rev 15724)
@@ -107,6 +107,10 @@
// expected behavior
}
+ // getting the first row only because Sybase throws NullPointerException
+ // if data is not read before closing the ResultSet
+ sr.next();
+
// Closing the ScrollableResults does currently force the batcher to
// aggressively release the connection
sr.close();
Modified: core/branches/Branch_3_2/test/org/hibernate/test/tm/CMTTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/tm/CMTTest.java 2008-12-22 23:27:26
UTC (rev 15723)
+++ core/branches/Branch_3_2/test/org/hibernate/test/tm/CMTTest.java 2008-12-22 23:28:32
UTC (rev 15724)
@@ -443,17 +443,18 @@
DummyTransactionManager.INSTANCE.begin();
s = getSessions().getCurrentSession();
results = s.createQuery( "from Item" ).scroll();
- while ( !results.isLast() ) {
- results.next();
+ while ( results.next() ) {
+ // do nothing
}
+
DummyTransactionManager.INSTANCE.getTransaction().commit();
// Next, scroll the entire result (closing)
DummyTransactionManager.INSTANCE.begin();
s = getSessions().getCurrentSession();
results = s.createQuery( "from Item" ).scroll();
- while ( !results.isLast() ) {
- results.next();
+ while ( results.next() ) {
+ // do nothing
}
results.close();
DummyTransactionManager.INSTANCE.getTransaction().commit();