fix for timeout

Netflix · Sep 7, 2022 · 6704c9a · 6704c9a
1 parent 14b50a6
commit 6704c9a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/evcache-core/src/main/java/com/netflix/evcache/operation/EVCacheOperationFuture.java b/evcache-core/src/main/java/com/netflix/evcache/operation/EVCacheOperationFuture.java
@@ -285,6 +285,10 @@ private static<T>  CompletableFuture<Void> getNext(CompletableFuture<T> future,
                 scheduledTimeout =
                         LazySharedExecutor.executor.schedule(
                                 () -> {
+                                    next.complete(null);
+                                    if (future.isDone()) {
+                                        return;
+                                    }
                                     if(log.isDebugEnabled()) log.debug("Throwing timeout exception after {} {} with timeout slot {}", timeout, unit, timeoutSlots);
                                     future.completeExceptionally(new TimeoutException("Timeout after " + timeout));
                                 },