Re: NationalSecurityAgency#879 Indicate whether we ar returning less …

…than the requested page size, corrected spelling
plainolneesh · May 13, 2021 · 918247f · 918247f
1 parent dec7d7a
commit 918247f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/web-services/query/src/main/java/datawave/webservice/query/runner/RunningQuery.java b/web-services/query/src/main/java/datawave/webservice/query/runner/RunningQuery.java
@@ -218,12 +218,17 @@ public ResultsPage next() throws Exception {
                     log.info("Query requested page size had been reached, aborting query.next call");
                     break;
                 }
+                //if the number of results returned less than requested, then break out
+                if (currentPageCount < this.logic.getMaxPageSize()) {
+                    log.info("Query requested page size returned less than requested, aborting query.next call");
+                    break;
+                }
                 // if the logic had a max page size and we have reached that, then break out
                 if (this.logic.getMaxPageSize() > 0 && currentPageCount >= this.logic.getMaxPageSize()) {
                     log.info("Query logic max page size has been reached, aborting query.next call");
                     break;
                 }
-                // if the logic had a page byte trigger and we have readed that, then break out
+                // if the logic had a page byte trigger and we have reached that, then break out
                 if (this.logic.getPageByteTrigger() > 0 && currentPageBytes >= this.logic.getPageByteTrigger()) {
                     log.info("Query logic max page byte trigger has been reached, aborting query.next call");
                     hitPageByteTrigger = true;