Skip to content

Commit fef0d16

Browse files
ginkelswallez
authored andcommitted
Re-evaluate predicate in FnCondition.whenReadyIf as the predicate may have changed while awaiting the condition (#502)
1 parent 013608d commit fef0d16

File tree

1 file changed

+5
-0
lines changed
  • java-client/src/main/java/co/elastic/clients/elasticsearch/_helpers/bulk

1 file changed

+5
-0
lines changed

java-client/src/main/java/co/elastic/clients/elasticsearch/_helpers/bulk/FnCondition.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ public <T> T whenReadyIf(BooleanSupplier canRun, Supplier<T> fn) {
8181
}
8282
condition.awaitUninterruptibly();
8383
}
84+
85+
if (canRun != null && !canRun.getAsBoolean()) {
86+
return null;
87+
}
88+
8489
return fn.get();
8590
} finally {
8691
lock.unlock();

0 commit comments

Comments
 (0)