In OrIterator.next(), only use candidateSet.first() as possible yield…

…Key if !contextRequired()
NationalSecurityAgency · Feb 1, 2024 · 4642b5b · 4642b5b
1 parent 610d637
commit 4642b5b
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/warehouse/query-core/src/main/java/datawave/query/iterator/logic/OrIterator.java b/warehouse/query-core/src/main/java/datawave/query/iterator/logic/OrIterator.java
@@ -195,10 +195,12 @@ public T next() {
                 }
             }
         } catch (WaitWindowOverrunException e) {
-            // if prev != null then it's a match that has not been returned
             Key possibleYieldKey = null;
-            if (prev != null || !candidateSet.isEmpty()) {
-                possibleYieldKey = (prev != null) ? (Key) prev : (Key) candidateSet.first();
+            if (prev != null) {
+                // if prev != null then it's a match that has not been returned
+                possibleYieldKey = (Key) prev;
+            } else if (!isContextRequired() && !candidateSet.isEmpty()) {
+                possibleYieldKey = (Key) candidateSet.first();
             }
             // When comparing possible yield keys in the OrIterator, we choose the lowest
             // key because a match in any sources can return a match