HHH-19280 ResourceRegistryStandardImpl#close(java.sql.Statement) is called on already closed statements

Author: dreab8

hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java

@@ -79,6 +79,7 @@ public class GeneratedValuesHelper {
 	 */
 	public static GeneratedValues getGeneratedValues(
 			ResultSet resultSet,
+			PreparedStatement statement,
 			EntityPersister persister,
 			EventType timing,
 			SharedSessionContractImplementor session) throws SQLException {
@@ -98,7 +99,7 @@ public static GeneratedValues getGeneratedValues(
 		}
 
 		final GeneratedValuesImpl generatedValues = new GeneratedValuesImpl( generatedProperties );
-		final Object[] results = readGeneratedValues( resultSet, persister, mappingProducer, session );
+		final Object[] results = readGeneratedValues( resultSet, statement, persister, mappingProducer, session );
 
 		if ( LOG.isDebugEnabled() ) {
 			LOG.debug( "Extracted generated values for entity "
@@ -125,22 +126,17 @@ public static GeneratedValues getGeneratedValues(
 	 */
 	private static Object[] readGeneratedValues(
 			ResultSet resultSet,
+			PreparedStatement statement,
 			EntityPersister persister,
 			JdbcValuesMappingProducer mappingProducer,
 			SharedSessionContractImplementor session) {
 		final ExecutionContext executionContext = new BaseExecutionContext( session );
 
-		final DirectResultSetAccess directResultSetAccess;
-		try {
-			directResultSetAccess = new DirectResultSetAccess(
+		final DirectResultSetAccess directResultSetAccess = new DirectResultSetAccess(
 					session,
-					(PreparedStatement) resultSet.getStatement(),
+					statement,
 					resultSet
 			);
-		}
-		catch (SQLException e) {
-			throw new HibernateException( "Could not retrieve statement from generated values result set", e );
-		}
 
 		final JdbcValues jdbcValues = new JdbcValuesResultSetImpl(
 				directResultSetAccess,

hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java

@@ -55,9 +55,9 @@ protected void bindParameters(Object entity, PreparedStatement ps, SharedSession
 	/**
 	 * Extract the generated key value from the given result set after execution of {@link #getSelectSQL()}.
 	 */
-	private GeneratedValues extractReturningValues(ResultSet resultSet, SharedSessionContractImplementor session)
+	private GeneratedValues extractReturningValues(ResultSet resultSet, PreparedStatement statement, SharedSessionContractImplementor session)
 			throws SQLException {
-		return getGeneratedValues( resultSet, persister, getTiming(), session );
+		return getGeneratedValues( resultSet, statement, persister, getTiming(), session );
 	}
 
 	@Override
@@ -98,7 +98,7 @@ public GeneratedValues performMutation(
 
 			final ResultSet resultSet = session.getJdbcCoordinator().getResultSetReturn().extract( idSelect, idSelectSql );
 			try {
-				return extractReturningValues( resultSet, session );
+				return extractReturningValues( resultSet, idSelect, session );
 			}
 			catch (SQLException e) {
 				throw jdbcServices.getSqlExceptionHelper().convert(
@@ -154,7 +154,7 @@ public final GeneratedValues performInsertReturning(String sql, SharedSessionCon
 				bindParameters( binder.getEntity(), idSelect, session );
 				ResultSet resultSet = jdbcCoordinator.getResultSetReturn().extract( idSelect, selectSQL );
 				try {
-					return extractReturningValues( resultSet, session );
+					return extractReturningValues( resultSet, idSelect, session );
 				}
 				finally {
 					jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( resultSet, idSelect );

hibernate-core/src/main/java/org/hibernate/id/insert/GetGeneratedKeysDelegate.java

@@ -106,7 +106,7 @@ public GeneratedValues performMutation(
 			try {
 				final ResultSet resultSet = preparedStatement.getGeneratedKeys();
 				try {
-					return getGeneratedValues( resultSet, persister, getTiming(), session );
+					return getGeneratedValues( resultSet, preparedStatement, persister, getTiming(), session );
 				}
 				catch (SQLException e) {
 					throw jdbcServices.getSqlExceptionHelper().convert(
@@ -158,7 +158,7 @@ public GeneratedValues executeAndExtractReturning(
 		try {
 			final ResultSet resultSet = preparedStatement.getGeneratedKeys();
 			try {
-				return getGeneratedValues( resultSet, persister, getTiming(), session );
+				return getGeneratedValues( resultSet, preparedStatement, persister, getTiming(), session );
 			}
 			catch (SQLException e) {
 				throw jdbcServices.getSqlExceptionHelper().convert(

hibernate-core/src/main/java/org/hibernate/id/insert/InsertReturningDelegate.java

@@ -83,7 +83,7 @@ protected GeneratedValues executeAndExtractReturning(
 
 		final ResultSet resultSet = jdbcCoordinator.getResultSetReturn().execute( preparedStatement, sql );
 		try {
-			return getGeneratedValues( resultSet, persister, getTiming(), session );
+			return getGeneratedValues( resultSet, preparedStatement, persister, getTiming(), session );
 		}
 		catch (SQLException e) {
 			throw jdbcServices.getSqlExceptionHelper().convert(

hibernate-core/src/main/java/org/hibernate/id/insert/SybaseJConnGetGeneratedKeysDelegate.java

@@ -49,7 +49,7 @@ public GeneratedValues executeAndExtractReturning(
 
 		ResultSet resultSet = jdbcCoordinator.getResultSetReturn().execute( preparedStatement, sql );
 		try {
-			return getGeneratedValues( resultSet, persister, getTiming(), session );
+			return getGeneratedValues( resultSet, preparedStatement, persister, getTiming(), session );
 		}
 		catch (SQLException e) {
 			throw jdbcServices.getSqlExceptionHelper().convert(