ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/jsr166y/ForkJoinPool.java
(Generate patch)

Comparing jsr166/src/jsr166y/ForkJoinPool.java (file contents):
Revision 1.100 by dl, Fri Apr 1 20:20:37 2011 UTC vs.
Revision 1.101 by dl, Wed Apr 13 11:35:30 2011 UTC

# Line 795 | Line 795 | public class ForkJoinPool extends Abstra
795              else if (w.eventCount != v)
796                  return true;                      // update next time
797          }
798 <        if ((int)c != 0 && parallelism + (int)(nc >> AC_SHIFT) == 0 &&
798 >        if ((!shutdown || !tryTerminate(false)) &&
799 >            (int)c != 0 && parallelism + (int)(nc >> AC_SHIFT) == 0 &&
800              blockedCount == 0 && quiescerCount == 0)
801              idleAwaitWork(w, nc, c, v);           // quiescent
802          for (boolean rescanned = false;;) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines