[hibernate-commits] Hibernate SVN: r15725 - in core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test: tm and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: gbadner
Date: 2008-12-22 18:30:23 -0500 (Mon, 22 Dec 2008)
New Revision: 15725

Modified:
   core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java
   core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/tm/CMTTest.java
Log:
HHH-3675 - Limitations on Sybase ResultSet implementation causes unit test failures


Modified: core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java
===================================================================
--- core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java	2008-12-22 23:28:32 UTC (rev 15724)
+++ core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java	2008-12-22 23:30:23 UTC (rev 15725)
@@ -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_3/testsuite/src/test/java/org/hibernate/test/tm/CMTTest.java
===================================================================
--- core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/tm/CMTTest.java	2008-12-22 23:28:32 UTC (rev 15724)
+++ core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/tm/CMTTest.java	2008-12-22 23:30:23 UTC (rev 15725)
@@ -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();