infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-08 17:38:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

8072030: Race condition in ThenComposeExceptionTest.java

Browse Source 
Reviewed-by: chegar
This commit is contained in:
Paul Sandoz 2015-02-02 14:21:32 +01:00
parent dd21d2c4db
commit c007f0f7d4
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jdk/test/java/util/concurrent/CompletableFuture/ThenComposeExceptionTest.java
View File

@ -36,7 +36,7 @@ import java.util.function.Consumer;
/**
* @test
* @bug 8068432
* @bug 8068432 8072030
* @run testng ThenComposeExceptionTest
* @summary Test that CompletableFuture.thenCompose works correctly if the
* composing future completes exceptionally
@ -92,7 +92,8 @@ public class ThenComposeExceptionTest {
Assert.assertNotSame(f_thenCompose, fe, "Composed CompletableFuture returned directly");
AtomicReference<Throwable> eOnWhenComplete = new AtomicReference<>();
f_thenCompose.whenComplete((r, e) -> eOnWhenComplete.set(e));
CompletableFuture<String> f_whenComplete = f_thenCompose.
whenComplete((r, e) -> eOnWhenComplete.set(e));
afterAction.accept(fe);
@ -103,10 +104,20 @@ public class ThenComposeExceptionTest {
catch (Throwable t) {
eOnJoined = t;
}
Assert.assertTrue(eOnWhenComplete.get() instanceof CompletionException,
"Incorrect exception reported on whenComplete");
Assert.assertTrue(eOnJoined instanceof CompletionException,
"Incorrect exception reported when joined");
"Incorrect exception reported when joined on thenCompose: " + eOnJoined);
// Need to wait for f_whenComplete to complete to avoid
// race condition when updating eOnWhenComplete
eOnJoined = null;
try {
f_whenComplete.join();
} catch (Throwable t) {
eOnJoined = t;
}
Assert.assertTrue(eOnJoined instanceof CompletionException,
"Incorrect exception reported when joined on whenComplete: " + eOnJoined);
Assert.assertTrue(eOnWhenComplete.get() instanceof CompletionException,
"Incorrect exception passed to whenComplete: " + eOnWhenComplete.get());
}
}
}