HHH-9784 - Scroll method does not support provided HQLQueryPlan

(cherry picked from commit be40ccf)

Author: sebersole

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

@@ -1327,7 +1327,12 @@ public Iterator iterate(String query, QueryParameters queryParameters) throws Hi
 		errorIfClosed();
 		checkTransactionSynchStatus();
 		queryParameters.validateParameters();
-		HQLQueryPlan plan = getHQLQueryPlan( query, true );
+
+		HQLQueryPlan plan = queryParameters.getQueryPlan();
+		if ( plan == null ) {
+			plan = getHQLQueryPlan( query, true );
+		}
+
 		autoFlushIfRequired( plan.getQuerySpaces() );
 
 		dontFlushFromFind++; //stops flush being called multiple times if this method is recursively called
@@ -1346,11 +1351,12 @@ public ScrollableResults scroll(String query, QueryParameters queryParameters) t
 		checkTransactionSynchStatus();
 
 		HQLQueryPlan plan = queryParameters.getQueryPlan();
-		if (plan == null) {
+		if ( plan == null ) {
 			plan = getHQLQueryPlan( query, false );
 		}
 
 		autoFlushIfRequired( plan.getQuerySpaces() );
+
 		dontFlushFromFind++;
 		try {
 			return plan.performScroll( queryParameters, this );