HHH-17887 Release mode After Statment with deferred result set access does not work

Author: dreab8

hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java

@@ -182,74 +182,79 @@ protected List<Object> extractResults(ResultSet resultSet) {
 executionContext
 );
 
-//noinspection unchecked
-final RowReader<Object> rowReader = (RowReader<Object>) ResultsHelper.createRowReader(
-executionContext,
-null,
-RowTransformerStandardImpl.INSTANCE,
-null,
-jdbcValues
-);
+try {
 
-/*
- * Processing options effectively are only used for entity loading. Here we don't need these values.
- */
-final JdbcValuesSourceProcessingOptions processingOptions = new JdbcValuesSourceProcessingOptions() {
-@Override
-public Object getEffectiveOptionalObject() {
-return null;
-}
+//noinspection unchecked
+final RowReader<Object> rowReader = (RowReader<Object>) ResultsHelper.createRowReader(
+executionContext,
+null,
+RowTransformerStandardImpl.INSTANCE,
+null,
+jdbcValues
+);
 
-@Override
-public String getEffectiveOptionalEntityName() {
-return null;
-}
+/*
+ * Processing options effectively are only used for entity loading. Here we don't need these values.
+ */
+final JdbcValuesSourceProcessingOptions processingOptions = new JdbcValuesSourceProcessingOptions() {
+@Override
+public Object getEffectiveOptionalObject() {
+return null;
+}
 
-@Override
-public Serializable getEffectiveOptionalId() {
-return null;
-}
+@Override
+public String getEffectiveOptionalEntityName() {
+return null;
+}
 
-@Override
-public boolean shouldReturnProxies() {
-return true;
-}
-};
+@Override
+public Serializable getEffectiveOptionalId() {
+return null;
+}
 
-final JdbcValuesSourceProcessingStateStandardImpl jdbcValuesSourceProcessingState =
-new JdbcValuesSourceProcessingStateStandardImpl(
+@Override
+public boolean shouldReturnProxies() {
+return true;
+}
+};
+
+final JdbcValuesSourceProcessingStateStandardImpl jdbcValuesSourceProcessingState =
+new JdbcValuesSourceProcessingStateStandardImpl(
+executionContext,
+processingOptions
+);
+final ArrayList<Object> results = new ArrayList<>();
+try {
+final RowProcessingStateStandardImpl rowProcessingState = new RowProcessingStateStandardImpl(
+jdbcValuesSourceProcessingState,
 executionContext,
-processingOptions
+rowReader,
+jdbcValues
 );
-final ArrayList<Object> results = new ArrayList<>();
-try {
-final RowProcessingStateStandardImpl rowProcessingState = new RowProcessingStateStandardImpl(
-jdbcValuesSourceProcessingState,
-executionContext,
-rowReader,
-jdbcValues
-);
 
-rowReader.getInitializersList().startLoading( rowProcessingState );
+rowReader.getInitializersList().startLoading( rowProcessingState );
 
-while ( rowProcessingState.next() ) {
-results.add( rowReader.readRow( rowProcessingState, processingOptions ) );
-rowProcessingState.finishRowProcessing( true );
+while ( rowProcessingState.next() ) {
+results.add( rowReader.readRow( rowProcessingState, processingOptions ) );
+rowProcessingState.finishRowProcessing( true );
+}
+if ( resultSetMapping.getNumberOfResultBuilders() == 0
+&& procedureCall.isFunctionCall()
+&& procedureCall.getFunctionReturn().getJdbcTypeCode() == Types.REF_CURSOR
+&& results.size() == 1
+&& results.get( 0 ) instanceof ResultSet ) {
+// When calling a function that returns a ref_cursor with as table function,
+// we have to unnest the ResultSet manually here
+return extractResults( (ResultSet) results.get( 0 ) );
+}
+return results;
 }
-if ( resultSetMapping.getNumberOfResultBuilders() == 0
-&& procedureCall.isFunctionCall()
-&& procedureCall.getFunctionReturn().getJdbcTypeCode() == Types.REF_CURSOR
-&& results.size() == 1
-&& results.get( 0 ) instanceof ResultSet ) {
-// When calling a function that returns a ref_cursor with as table function,
-// we have to unnest the ResultSet manually here
-return extractResults( (ResultSet) results.get( 0 ) );
+finally {
+rowReader.finishUp( jdbcValuesSourceProcessingState );
+jdbcValuesSourceProcessingState.finishUp( results.size() > 1 );
 }
-return results;
 }
 finally {
-rowReader.finishUp( jdbcValuesSourceProcessingState );
-jdbcValuesSourceProcessingState.finishUp( results.size() > 1 );
 jdbcValues.finishUp( this.context.getSession() );
 }
 }

hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java

@@ -253,7 +253,6 @@ private void executeQuery() {
 
 skipRows( resultSet );
 logicalConnection.getResourceRegistry().register( resultSet, preparedStatement );
-
 }
 catch (SQLException e) {
 try {
@@ -267,9 +266,6 @@ private void executeQuery() {
 "JDBC exception executing SQL [" + finalSql + "]"
 );
 }
-finally {
-logicalConnection.afterStatement();
-}
 }
 
 private JdbcSessionContext context() {
@@ -324,20 +320,18 @@ protected LockMode determineFollowOnLockMode(LockOptions lockOptions) {
 
 @Override
 public void release() {
+final LogicalConnectionImplementor logicalConnection = getPersistenceContext().getJdbcCoordinator()
+.getLogicalConnection();
 if ( resultSet != null ) {
-getPersistenceContext().getJdbcCoordinator()
-.getLogicalConnection()
-.getResourceRegistry()
-.release( resultSet, preparedStatement );
+logicalConnection.getResourceRegistry().release( resultSet, preparedStatement );
 resultSet = null;
 }
 
 if ( preparedStatement != null ) {
-getPersistenceContext().getJdbcCoordinator()
-.getLogicalConnection()
-.getResourceRegistry()
-.release( preparedStatement );
+logicalConnection.getResourceRegistry().release( preparedStatement );
 preparedStatement = null;
 }
+
+logicalConnection.afterStatement();
 }
 }