ViewVC Help

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

root/jsr166/jsr166/src/jsr166y/ForkJoinPool.java

Comparing jsr166/src/jsr166y/ForkJoinPool.java (file contents):
Revision 1.83 by dl, Sun Oct 24 19:37:26 2010 UTC vs.
Revision 1.84 by dl, Sat Nov 13 13:11:51 2010 UTC

#	Line 1128 | Line 1128 | public class ForkJoinPool extends Abstra
1128		// Finish now if all threads terminated; else in some subsequent call
1129		if ((workerCounts >>> TOTAL_COUNT_SHIFT) == 0) {
1130		advanceRunLevel(TERMINATED);
1131	<	termination.arrive();
1131	>	termination.forceTermination();
1132		}
1133		return true;
1134		}
#	Line 1796 | Line 1796 | public class ForkJoinPool extends Abstra
1796		public boolean awaitTermination(long timeout, TimeUnit unit)
1797		throws InterruptedException {
1798		try {
1799	<	return termination.awaitAdvanceInterruptibly(0, timeout, unit) > 0;
1799	>	termination.awaitAdvanceInterruptibly(0, timeout, unit);
1800		} catch (TimeoutException ex) {
1801		return false;
1802		}
1803	+	return true;
1804		}
1805
1806		/**

Diff Legend

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