Skip to content

Commit 4d8da77

Browse files
author
nathan.xu
committed
remove unused close(Statement) and close(ResultSet) from JdbcCoordinatorImpl
1 parent de34086 commit 4d8da77

File tree

1 file changed

+8
-75
lines changed

1 file changed

+8
-75
lines changed

hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java

Lines changed: 8 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,13 @@
44
*/
55
package org.hibernate.engine.jdbc.internal;
66

7-
import java.io.IOException;
8-
import java.io.ObjectInputStream;
9-
import java.io.ObjectOutputStream;
10-
import java.sql.Connection;
11-
import java.sql.ResultSet;
12-
import java.sql.SQLException;
13-
import java.sql.Statement;
14-
import java.util.function.Supplier;
15-
167
import org.hibernate.ConnectionReleaseMode;
178
import org.hibernate.HibernateException;
189
import org.hibernate.TransactionException;
1910
import org.hibernate.engine.jdbc.batch.JdbcBatchLogging;
2011
import org.hibernate.engine.jdbc.batch.spi.Batch;
2112
import org.hibernate.engine.jdbc.batch.spi.BatchKey;
2213
import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup;
23-
import org.hibernate.engine.jdbc.spi.InvalidatableWrapper;
2414
import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
2515
import org.hibernate.engine.jdbc.spi.JdbcServices;
2616
import org.hibernate.engine.jdbc.spi.JdbcWrapper;
@@ -40,6 +30,14 @@
4030
import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor;
4131
import org.hibernate.resource.transaction.backend.jdbc.spi.JdbcResourceTransaction;
4232

33+
import java.io.IOException;
34+
import java.io.ObjectInputStream;
35+
import java.io.ObjectOutputStream;
36+
import java.sql.Connection;
37+
import java.sql.SQLException;
38+
import java.sql.Statement;
39+
import java.util.function.Supplier;
40+
4341
import static org.hibernate.ConnectionReleaseMode.AFTER_STATEMENT;
4442

4543
/**
@@ -357,71 +355,6 @@ public void disableReleases() {
357355
releasesEnabled = false;
358356
}
359357

360-
protected void close(Statement statement) {
361-
LOG.tracev( "Closing prepared statement [{0}]", statement );
362-
363-
// Important for Statement caching -- some DBs (especially Sybase) log warnings on every Statement under
364-
// certain situations.
365-
sqlExceptionHelper().logAndClearWarnings( statement );
366-
367-
if ( statement instanceof InvalidatableWrapper ) {
368-
@SuppressWarnings("unchecked")
369-
final InvalidatableWrapper<Statement> wrapper = (InvalidatableWrapper<Statement>) statement;
370-
close( wrapper.getWrappedObject() );
371-
wrapper.invalidate();
372-
}
373-
else {
374-
try {
375-
// if we are unable to "clean" the prepared statement,
376-
// we do not close it
377-
try {
378-
if ( statement.getMaxRows() != 0 ) {
379-
statement.setMaxRows( 0 );
380-
}
381-
if ( statement.getQueryTimeout() != 0 ) {
382-
statement.setQueryTimeout( 0 );
383-
}
384-
}
385-
catch( SQLException sqle ) {
386-
// there was a problem "cleaning" the prepared statement
387-
if ( LOG.isDebugEnabled() ) {
388-
LOG.debugf( "Exception clearing maxRows/queryTimeout [%s]", sqle.getMessage() );
389-
}
390-
// EARLY EXIT!!!
391-
return;
392-
}
393-
statement.close();
394-
if ( lastQuery == statement ) {
395-
lastQuery = null;
396-
}
397-
}
398-
catch ( Exception e ) {
399-
LOG.debugf( "Unable to release JDBC statement [%s]", e.getMessage() );
400-
}
401-
}
402-
}
403-
404-
405-
protected void close(ResultSet resultSet) {
406-
LOG.tracev( "Closing result set [{0}]", resultSet );
407-
408-
if ( resultSet instanceof InvalidatableWrapper ) {
409-
@SuppressWarnings("unchecked")
410-
final InvalidatableWrapper<ResultSet> wrapper = (InvalidatableWrapper<ResultSet>) resultSet;
411-
close( wrapper.getWrappedObject() );
412-
wrapper.invalidate();
413-
return;
414-
}
415-
416-
try {
417-
resultSet.close();
418-
}
419-
catch ( Exception e ) {
420-
// try to handle general errors more elegantly
421-
LOG.debugf( "Unable to release JDBC result set [%s]", e.getMessage() );
422-
}
423-
}
424-
425358
@Override
426359
public boolean isActive() {
427360
return owner.getJdbcSessionContext().isActive();

0 commit comments

Comments
 (0)