HHH-10860 - Fix Query#scroll() throws NPE

hibernate · Jun 22, 2016 · ad5c0f6 · ad5c0f6
1 parent 1e5a022
commit ad5c0f6
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/AbstractProducedQuery.java b/hibernate-core/src/main/java/org/hibernate/query/internal/AbstractProducedQuery.java
@@ -1343,12 +1343,10 @@ public ScrollableResultsImplementor scroll(ScrollMode scrollMode) {
 	}
 
 	protected ScrollableResultsImplementor doScroll(ScrollMode scrollMode) {
+		final String query = queryParameterBindings.expandListValuedParameters( getQueryString(), getProducer() );
 		QueryParameters queryParameters = getQueryParameters();
 		queryParameters.setScrollMode( scrollMode );
-		return getProducer().scroll(
-				queryParameterBindings.expandListValuedParameters( getQueryString(), getProducer() ),
-				queryParameters
-		);
+		return getProducer().scroll( query, queryParameters );
 	}
 
 	@Override