From 9e1258d0c34c04d9bb102f3ae3599650c2e4cb38 Mon Sep 17 00:00:00 2001
From: Doug Lea <dl@openjdk.org>
Date: Mon, 28 Nov 2016 23:33:25 -0800
Subject: [PATCH] 8169243:
java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java still fails
intermittently
Reviewed-by: martin, smarks, psandoz, amlu
---
.../util/concurrent/ThreadPoolExecutor/ConfigChanges.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/jdk/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java b/jdk/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java
index 71862dc8935..ce5561e4d40 100644
--- a/jdk/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java
+++ b/jdk/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java
@@ -247,7 +247,13 @@ public class ConfigChanges {
tg.activeCount() > 0)
Thread.sleep(4);
equal(tg.activeCount(), 0);
- check(System.nanoTime() - t0 >= tpe.getKeepAliveTime(NANOSECONDS));
+
+ // The following assertion is almost always true, but may
+ // exceptionally not be during a transition from core count
+ // too high to allowCoreThreadTimeOut. Users will never
+ // notice, and we accept the small loss of testability.
+ //
+ // check(System.nanoTime() - t0 >= tpe.getKeepAliveTime(NANOSECONDS));
//report("idle", tpe);