22 |
|
import java.util.NoSuchElementException; |
23 |
|
import java.util.PropertyPermission; |
24 |
|
import java.util.concurrent.*; |
25 |
– |
import java.util.concurrent.atomic.AtomicBoolean; |
25 |
|
import java.util.concurrent.atomic.AtomicReference; |
26 |
|
import static java.util.concurrent.TimeUnit.MILLISECONDS; |
27 |
|
import static java.util.concurrent.TimeUnit.NANOSECONDS; |
629 |
|
void joinPool(ExecutorService exec) { |
630 |
|
try { |
631 |
|
exec.shutdown(); |
632 |
< |
assertTrue("ExecutorService did not terminate in a timely manner", |
633 |
< |
exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)); |
632 |
> |
if (!exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) |
633 |
> |
fail("ExecutorService " + exec + |
634 |
> |
" did not terminate in a timely manner"); |
635 |
|
} catch (SecurityException ok) { |
636 |
|
// Allowed in case test doesn't have privs |
637 |
|
} catch (InterruptedException ie) { |