8268080: java/util/concurrent/forkjoin/AsyncShutdownNow.java fails wi…

…th java.util.concurrent.RejectedExecutionException

Co-authored-by: Doug Lea <dl@openjdk.org>
Reviewed-by: chegar, dfuchs

test/jdk/java/util/concurrent/forkjoin/AsyncShutdownNow.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, 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
@@ -38,6 +38,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
@@ -102,7 +103,7 @@ public void testFutureGet(ExecutorService executor) throws Exception {
             try {
                 future.get();
                 assertTrue(false);
-            } catch (ExecutionException e) {
+            } catch (ExecutionException | RejectedExecutionException e) {
                 // expected
             }
         } finally {
@@ -123,7 +124,7 @@ public void testTimedFutureGet(ExecutorService executor) throws Exception {
             try {
                 future.get(1, TimeUnit.HOURS);
                 assertTrue(false);
-            } catch (ExecutionException e) {
+            } catch (ExecutionException | RejectedExecutionException e) {
                 // expected
             }
         } finally {
@@ -167,7 +168,7 @@ public void testInvokeAny(ExecutorService executor) throws Exception {
                 // execute long running tasks
                 executor.invokeAny(List.of(SLEEP_FOR_A_DAY, SLEEP_FOR_A_DAY));
                 assertTrue(false);
-            } catch (ExecutionException e) {
+            } catch (ExecutionException | RejectedExecutionException e) {
                 // expected
             }
         } finally {

test/jdk/java/util/concurrent/forkjoin/AsyncShutdownNowInvokeAny.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, 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
@@ -36,6 +36,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
@@ -89,7 +90,7 @@ public void testInvokeAny() throws Exception {
                     // execute long running tasks
                     pool.invokeAny(List.of(SLEEP_FOR_A_DAY, SLEEP_FOR_A_DAY));
                     assertTrue(false);
-                } catch (ExecutionException e) {
+                } catch (ExecutionException | RejectedExecutionException e) {
                     // expected
                 }
             } finally {