From 517763ddf16f140053bb5fcccdcc42d623048e8b Mon Sep 17 00:00:00 2001
From: Doug Lea <dl@openjdk.org>
Date: Wed, 13 Jul 2011 12:24:56 +0100
Subject: [PATCH] 7057320:
 test/java/util/concurrent/Executors/AutoShutdown.java failing intermittently

Add retry/timeout for checking activeCount

Reviewed-by: chegar
---
 jdk/test/java/util/concurrent/Executors/AutoShutdown.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/jdk/test/java/util/concurrent/Executors/AutoShutdown.java b/jdk/test/java/util/concurrent/Executors/AutoShutdown.java
index eff57592397..449b81d59c6 100644
--- a/jdk/test/java/util/concurrent/Executors/AutoShutdown.java
+++ b/jdk/test/java/util/concurrent/Executors/AutoShutdown.java
@@ -67,6 +67,11 @@ public class AutoShutdown {
         e1 = e2 = null;
         for (int i = 0; i < 10 && Thread.activeCount() > count0; i++)
             tryWaitForFinalizersToRun();
+        for (int i = 0; i < 10; ++i) { // give JVM a chance to settle.
+            if (Thread.activeCount() == count0)
+                return;
+            Thread.sleep(1000);
+        }
         equal(Thread.activeCount(), count0);
     }