fix ListenableFutureUtils#toCompletableFuture cancellation propagation

foldright · Jul 22, 2024 · 5dcd812 · 5dcd812
1 parent 3036128
commit 5dcd812
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/cffu-core/src/main/java/io/foldright/cffu/ListenableFutureUtils.java b/cffu-core/src/main/java/io/foldright/cffu/ListenableFutureUtils.java
@@ -50,7 +50,12 @@ public String toString() {
             }
         };
         // propagate cancellation by CancellationException from outer adapter to LF
-        CompletableFutureUtils.peek(ret, (v, ex) -> lf.cancel(false));
+        CompletableFutureUtils.peek(ret, (v, ex) -> {
+            ex = CompletableFutureUtils.unwrapCfException(ex);
+            if (ex instanceof CancellationException) {
+                lf.cancel(false);
+            }
+        });
 
         Futures.addCallback(lf, new FutureCallback<T>() {
             @Override