JAVA-2934: Get rid of code hanging if there is empty page with next page attribute

dssysolyatin · dssysolyatin · commit 989230029667 · 2021-04-13T14:44:43.000+03:00
diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/ReactiveResultSetSubscription.java b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/ReactiveResultSetSubscription.java
@@ -277,13 +277,10 @@ private Object tryNext() {
         if (pages.poll() == null) {
           throw new AssertionError("Queue is empty, this should not happen");
         }
-        current = pages.peek();
         // if the next page is readily available,
         // serve its first row now, no need to wait
         // for the next drain.
-        if (current != null && current.hasMoreRows()) {
-          return current.nextRow();
-        }
+        tryNext();
       }
     }
     // No items available right now.

Original file line number	Diff line number	Diff line change
`@@ -277,13 +277,10 @@ private Object tryNext() {`
`277`	`277`	`if (pages.poll() == null) {`
`278`	`278`	`throw new AssertionError("Queue is empty, this should not happen");`
`279`	`279`	`}`
`280`		`- current = pages.peek();`
`281`	`280`	`// if the next page is readily available,`
`282`	`281`	`// serve its first row now, no need to wait`
`283`	`282`	`// for the next drain.`
`284`		`- if (current != null && current.hasMoreRows()) {`
`285`		`- return current.nextRow();`
`286`		`- }`
	`283`	`+ tryNext();`
`287`	`284`	`}`
`288`	`285`	`}`
`289`	`286`	`// No items available right now.`