HHH-17826 ResultSet closed while scrolling results

Author: dreab8

hibernate-core/src/main/java/org/hibernate/internal/ScrollableResultsImpl.java

@@ -129,16 +129,20 @@ private void prepareCurrentRow(boolean underlyingScrollSuccessful) {
 		loadContexts.register( getJdbcValuesSourceProcessingState() );
 		persistenceContext.beforeLoad();
 		try {
-			currentRow = getRowReader().readRow( getRowProcessingState(), getProcessingOptions() );
-
-			getRowProcessingState().finishRowProcessing();
-			getJdbcValuesSourceProcessingState().finishUp( false );
+			try {
+				currentRow = getRowReader().readRow( getRowProcessingState(), getProcessingOptions() );
+
+				getRowProcessingState().finishRowProcessing( );
+				getJdbcValuesSourceProcessingState().finishUp( false );
+			}
+			finally {
+				persistenceContext.afterLoad();
+			}
+			persistenceContext.initializeNonLazyCollections();
 		}
 		finally {
-			persistenceContext.afterLoad();
 			loadContexts.deregister( getJdbcValuesSourceProcessingState() );
 		}
-		persistenceContext.initializeNonLazyCollections();
 
 		afterScrollOperation();
 	}