8303742: CompletableFuture.orTimeout leaks if the future completes exceptionally

Reviewed-by: jpai, alanb
This commit is contained in:
Viktor Klang 2023-03-20 13:55:47 +00:00 committed by Jaikiran Pai
parent 652bda0af8
commit ded6a81319
2 changed files with 64 additions and 1 deletions
src/java.base/share/classes/java/util/concurrent
test/jdk/java/util/concurrent/CompletableFuture

@ -2937,7 +2937,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
final Future<?> f;
Canceller(Future<?> f) { this.f = f; }
public void accept(Object ignore, Throwable ex) {
if (ex == null && f != null && !f.isDone())
if (f != null && !f.isDone())
f.cancel(false);
}
}

@ -0,0 +1,63 @@
/*
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8303742
* @summary CompletableFuture.orTimeout can leak memory if completed exceptionally
* @run junit/othervm -Xmx128m CompletableFutureOrTimeoutExceptionallyTest
*/
import java.time.Duration;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import org.junit.jupiter.api.Test;
class CompletableFutureOrTimeoutExceptionallyTest {
/**
* Test that orTimeout task is cancelled if the CompletableFuture is completed Exceptionally
*/
@Test
void testOrTimeoutWithCompleteExceptionallyDoesNotLeak() {
var count = 0L;
while (count++ < 2_000_000) {
new CompletableFuture<>()
.orTimeout(12, TimeUnit.HOURS)
.completeExceptionally(new RuntimeException("This is fine"));
}
}
/**
* Test that the completeOnTimeout task is cancelled if the CompletableFuture is completed Exceptionally
*/
@Test
void testCompleteOnTimeoutWithCompleteExceptionallyDoesNotLeak() {
var count = 0L;
while (count++ < 2_000_000) {
new CompletableFuture<>()
.completeOnTimeout(null, 12, TimeUnit.HOURS)
.completeExceptionally(new RuntimeException("This is fine"));
}
}
}