Re-evaluate predicate in FnCondition.whenReadyIf as the predicate may…

… have changed while awaiting the condition (#502) (#510) Co-authored-by: Thilo-Alexander Ginkel <tg@tgbyte.de>
elastic · Feb 13, 2023 · 93e176c · 93e176c
1 parent 013608d
commit 93e176c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_helpers/bulk/FnCondition.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_helpers/bulk/FnCondition.java
@@ -81,6 +81,11 @@ public <T> T whenReadyIf(BooleanSupplier canRun, Supplier<T> fn) {
                 }
                 condition.awaitUninterruptibly();
             }
+
+            if (canRun != null && !canRun.getAsBoolean()) {
+                return null;
+            }
+
             return fn.get();
         } finally {
             lock.unlock();