DATAES-764 - StreamQueries#streamResults does not clear scroll context when finished

Author: xhaggi

src/main/java/org/springframework/data/elasticsearch/core/StreamQueries.java

@@ -26,6 +26,7 @@
  * Utility to support streaming queries.
  *
  * @author Mark Paluch
+ * @author Sascha Woo
  * @since 3.2
  */
 abstract class StreamQueries {
@@ -56,8 +57,7 @@ static <T> CloseableIterator<T> streamResults(ScrolledPage<T> page,
 			@Override
 			public void close() {
 				try {
-					// Clear scroll on cluster only in case of error (cause elasticsearch auto clear scroll when it's done)
-					if (!finished && scrollId != null && currentHits != null && currentHits.hasNext()) {
+					if (scrollId != null) {
 						clearScroll.accept(scrollId);
 					}
 				} finally {
@@ -73,7 +73,7 @@ public boolean hasNext() {
 					return false;
 				}
 				// Test if it remains hits
-				if (currentHits == null || !currentHits.hasNext()) {
+				if (!currentHits.hasNext()) {
 					// Do a new request
 					ScrolledPage<T> scroll = continueFunction.apply(scrollId);
 					// Save hits and scroll id