[hibernate-commits] Hibernate SVN: r11333 - in branches/Branch_3_2/Hibernate3: test/org/hibernate/junit/functional and 1 other directories.
Author: steve.ebersole(a)jboss.com
Date: 2007-03-22 13:35:22 -0400 (Thu, 22 Mar 2007)
New Revision: 11333
Modified:
branches/Branch_3_2/Hibernate3/src/org/hibernate/jdbc/AbstractBatcher.java
branches/Branch_3_2/Hibernate3/test/org/hibernate/junit/functional/FunctionalTestCase.java
branches/Branch_3_2/Hibernate3/test/org/hibernate/test/connections/SuppliedConnectionTest.java
Log:
sybase testsuite
Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/jdbc/AbstractBatcher.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/jdbc/AbstractBatcher.java 2007-03-22
17:34:55 UTC (rev 11332)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/jdbc/AbstractBatcher.java 2007-03-22
17:35:22 UTC (rev 11333)
@@ -196,17 +196,21 @@
return rs;
}
+
public void closeQueryStatement(PreparedStatement ps, ResultSet rs) throws SQLException
{
- statementsToClose.remove( ps );
+ boolean psStillThere = statementsToClose.remove( ps );
try {
if ( rs != null ) {
- resultSetsToClose.remove( rs );
- logCloseResults();
- rs.close();
+ if ( resultSetsToClose.remove( rs ) ) {
+ logCloseResults();
+ rs.close();
+ }
}
}
finally {
- closeQueryStatement( ps );
+ if ( psStillThere ) {
+ closeQueryStatement( ps );
+ }
}
}
@@ -313,6 +317,10 @@
// no big deal
log.warn("Could not close a JDBC result set", e);
}
+ catch (Throwable e) {
+ // sybase driver (jConnect) throwing NPE here in certain cases
+ log.warn("Could not close a JDBC result set", e);
+ }
}
resultSetsToClose.clear();
Modified:
branches/Branch_3_2/Hibernate3/test/org/hibernate/junit/functional/FunctionalTestCase.java
===================================================================
---
branches/Branch_3_2/Hibernate3/test/org/hibernate/junit/functional/FunctionalTestCase.java 2007-03-22
17:34:55 UTC (rev 11332)
+++
branches/Branch_3_2/Hibernate3/test/org/hibernate/junit/functional/FunctionalTestCase.java 2007-03-22
17:35:22 UTC (rev 11333)
@@ -118,6 +118,7 @@
assertAllDataRemoved();
}
catch ( Throwable e ) {
+ log.trace( "test run resulted in error; attempting to cleanup", e );
try {
if ( session != null && session.isOpen() ) {
if ( session.isConnected() ) {
Modified:
branches/Branch_3_2/Hibernate3/test/org/hibernate/test/connections/SuppliedConnectionTest.java
===================================================================
---
branches/Branch_3_2/Hibernate3/test/org/hibernate/test/connections/SuppliedConnectionTest.java 2007-03-22
17:34:55 UTC (rev 11332)
+++
branches/Branch_3_2/Hibernate3/test/org/hibernate/test/connections/SuppliedConnectionTest.java 2007-03-22
17:35:22 UTC (rev 11333)
@@ -52,20 +52,31 @@
cfg.setProperty( Environment.RELEASE_CONNECTIONS,
ConnectionReleaseMode.ON_CLOSE.toString() );
cfg.setProperty( Environment.CONNECTION_PROVIDER,
UserSuppliedConnectionProvider.class.getName() );
boolean supportsScroll = true;
+ Connection conn = null;
try {
- Connection conn = cp.getConnection();
+ conn = cp.getConnection();
supportsScroll =
conn.getMetaData().supportsResultSetType(ResultSet.TYPE_SCROLL_INSENSITIVE);
}
catch( Throwable ignore ) {
}
+ finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ }
+ catch( Throwable ignore ) {
+ // ignore it...
+ }
+ }
+ }
cfg.setProperty( Environment.USE_SCROLLABLE_RESULTSET, "" + supportsScroll
);
}
- protected boolean dropAfterFailure() {
+ public boolean createSchema() {
return false;
}
- protected boolean recreateSchema() {
+ public boolean recreateSchemaAfterFailure() {
return false;
}