[hibernate-commits] Hibernate SVN: r15726 - in core/trunk/testsuite/src/test/java/org/hibernate/test: tm and 1 other directory.
Author: gbadner
Date: 2008-12-22 18:31:15 -0500 (Mon, 22 Dec 2008)
New Revision: 15726
Modified:
core/trunk/testsuite/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java
core/trunk/testsuite/src/test/java/org/hibernate/test/tm/CMTTest.java
Log:
HHH-3675 - Limitations on Sybase ResultSet implementation causes unit test failures
Modified:
core/trunk/testsuite/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java
===================================================================
---
core/trunk/testsuite/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java 2008-12-22
23:30:23 UTC (rev 15725)
+++
core/trunk/testsuite/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java 2008-12-22
23:31:15 UTC (rev 15726)
@@ -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/trunk/testsuite/src/test/java/org/hibernate/test/tm/CMTTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/tm/CMTTest.java 2008-12-22
23:30:23 UTC (rev 15725)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/tm/CMTTest.java 2008-12-22
23:31:15 UTC (rev 15726)
@@ -442,8 +442,8 @@
SimpleJtaTransactionManagerImpl.getInstance().begin();
s = getSessions().getCurrentSession();
results = s.createQuery( "from Item" ).scroll();
- while ( !results.isLast() ) {
- results.next();
+ while ( results.next() ) {
+ // do nothing
}
SimpleJtaTransactionManagerImpl.getInstance().getTransaction().commit();
@@ -451,8 +451,8 @@
SimpleJtaTransactionManagerImpl.getInstance().begin();
s = getSessions().getCurrentSession();
results = s.createQuery( "from Item" ).scroll();
- while ( !results.isLast() ) {
- results.next();
+ while ( results.next() ) {
+ // do nothing
}
results.close();
SimpleJtaTransactionManagerImpl.getInstance().getTransaction().commit();