--- jsr166/src/jsr166y/ForkJoinPool.java 2011/04/01 20:20:37 1.100 +++ jsr166/src/jsr166y/ForkJoinPool.java 2011/04/13 11:35:30 1.101 @@ -795,7 +795,8 @@ public class ForkJoinPool extends Abstra else if (w.eventCount != v) return true; // update next time } - if ((int)c != 0 && parallelism + (int)(nc >> AC_SHIFT) == 0 && + if ((!shutdown || !tryTerminate(false)) && + (int)c != 0 && parallelism + (int)(nc >> AC_SHIFT) == 0 && blockedCount == 0 && quiescerCount == 0) idleAwaitWork(w, nc, c, v); // quiescent for (boolean rescanned = false;;) {