ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/concurrent/ForkJoinPool.java

Comparing jsr166/src/main/java/util/concurrent/ForkJoinPool.java (file contents):
Revision 1.47 by jsr166, Mon Nov 22 20:10:51 2010 UTC vs.
Revision 1.48 by dl, Tue Nov 23 00:10:21 2010 UTC

#	Line 1058 | Line 1058 | public class ForkJoinPool extends Abstra
1058		long h = eventWaiters;
1059		if (h != 0L && (int)(h >>> EVENT_COUNT_SHIFT) != eventCount)
1060		releaseEventWaiters();
1061	–	if (joinMe.status < 0)
1062	–	break;
1061		if ((workerCounts & RUNNING_COUNT_MASK) != 0) {
1062		long ms; int ns;
1063		if (!timed) {
#	Line 1078 | Line 1076 | public class ForkJoinPool extends Abstra
1076		else
1077		ns = (int) (nt % 1000000);
1078		}
1079	<	if (joinMe.internalAwaitDone(ms, ns) < 0)
1082	<	break;
1079	>	joinMe.internalAwaitDone(ms, ns);
1080		}
1081	+	if (joinMe.status < 0)
1082	+	break;
1083		}
1084		helpMaintainParallelism();
1085		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines