--- jsr166/src/test/tck/ScheduledExecutorTest.java	2011/05/07 19:49:37	1.41
+++ jsr166/src/test/tck/ScheduledExecutorTest.java	2011/05/27 19:48:58	1.43
@@ -20,7 +20,6 @@ public class ScheduledExecutorTest exten
         return new TestSuite(ScheduledExecutorTest.class);
     }
 
-
     /**
      * execute successfully executes a runnable
      */
@@ -39,7 +38,6 @@ public class ScheduledExecutorTest exten
         }
     }
 
-
     /**
      * delayed schedule of callable successfully executes after delay
      */
@@ -176,7 +174,6 @@ public class ScheduledExecutorTest exten
         joinPool(p);
     }
 
-
     /**
      * execute(null) throws NPE
      */
@@ -473,7 +470,6 @@ public class ScheduledExecutorTest exten
         assertTrue(p.isShutdown());
     }
 
-
     /**
      * isTerminated is false before termination, true after
      */
@@ -664,7 +660,6 @@ public class ScheduledExecutorTest exten
         }
     }
 
-
     /**
      * If setExecuteExistingDelayedTasksAfterShutdownPolicy is false,
      * delayed tasks are cancelled at shutdown
@@ -702,16 +697,16 @@ public class ScheduledExecutorTest exten
         p.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
         assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
         assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
+        long initialDelay = LONG_DELAY_MS;
         ScheduledFuture task =
-            p.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, MILLISECONDS);
+            p.scheduleAtFixedRate(new NoOpRunnable(), initialDelay,
+                                  5, MILLISECONDS);
         try { p.shutdown(); } catch (SecurityException ok) { return; }
         assertTrue(p.isShutdown());
-        BlockingQueue q = p.getQueue();
         assertTrue(p.getQueue().isEmpty());
         assertTrue(task.isDone());
         assertTrue(task.isCancelled());
-        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
-        assertTrue(p.isTerminated());
+        joinPool(p);
     }
 
     /**
@@ -1175,5 +1170,4 @@ public class ScheduledExecutorTest exten
         }
     }
 
-
 }