fix: more non-interrupting future task cancellation cleanups

smallrye · Nov 22, 2023 · d883a75 · d883a75
1 parent 905e55b
commit d883a75
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/...ementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiBufferWithTimeoutOp.java b/...ementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiBufferWithTimeoutOp.java
@@ -236,7 +236,7 @@ public void request(long n) {
         public void onCompletion() {
             if (terminated.compareAndSet(RUNNING, SUCCEED)) {
                 if (task != null) {
-                    task.cancel(true);
+                    task.cancel(false);
                     task = null;
                 }
                 checkedComplete();

diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiDemandPacer.java b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiDemandPacer.java
@@ -136,7 +136,7 @@ public void onCompletion() {
         @Override
         public void cancel() {
             if (scheduledFuture != null) {
-                scheduledFuture.cancel(true);
+                scheduledFuture.cancel(false);
             }
             super.cancel();
         }

diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiWindowOnDurationOp.java b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiWindowOnDurationOp.java
@@ -267,7 +267,7 @@ boolean replace(Future<?> task) {
                 Future current = container.get();
                 if (current == NONE) {
                     if (task != null) {
-                        task.cancel(true);
+                        task.cancel(false);
                     }
                     return false;
                 }

diff --git a/...ation/src/main/java/io/smallrye/mutiny/operators/multi/multicast/MultiReferenceCount.java b/...ation/src/main/java/io/smallrye/mutiny/operators/multi/multicast/MultiReferenceCount.java
@@ -75,7 +75,7 @@ void cancel(ConnectableMultiConnection connection) {
         }
 
         ScheduledFuture<?> future = executor.schedule(connection, duration.toMillis(), TimeUnit.MILLISECONDS);
-        connection.setTimer(() -> future.cancel(true));
+        connection.setTimer(() -> future.cancel(false));
     }
 
     void terminated(ConnectableMultiConnection connection) {

diff --git a/implementation/src/test/java/io/smallrye/mutiny/operators/MultiIgnoreTest.java b/implementation/src/test/java/io/smallrye/mutiny/operators/MultiIgnoreTest.java
@@ -69,7 +69,7 @@ public void testAsUniWithNever() {
                 .onItem().ignoreAsUni().subscribeAsCompletionStage();
 
         assertThat(future).isNotCompleted();
-        future.cancel(true);
+        future.cancel(false);
     }
 
     @Test

diff --git a/implementation/src/test/java/io/smallrye/mutiny/operators/UniCreateFromFutureTest.java b/implementation/src/test/java/io/smallrye/mutiny/operators/UniCreateFromFutureTest.java
@@ -371,7 +371,7 @@ public void testWithInterruptedFuture() {
         UniAssertSubscriber<String> subscriber = UniAssertSubscriber.create();
         CompletableFuture<String> cs = new CompletableFuture<>();
         Uni.createFrom().future(cs).subscribe().withSubscriber(subscriber);
-        cs.cancel(true);
+        cs.cancel(false);
         subscriber
                 .awaitFailure()
                 .assertFailedWith(CancellationException.class, null);