ViewVC Help

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

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

Comparing jsr166/src/main/java/util/concurrent/CyclicBarrier.java (file contents):
Revision 1.22 by dl, Sat Dec 27 19:26:25 2003 UTC vs.
Revision 1.23 by dl, Sat Jan 10 20:37:03 2004 UTC

#	Line 175 | Line 175 | public class CyclicBarrier {
175		try {
176		if (!timed)
177		trip.await();
178	<	else if (nanos > 0)
178	>	else if (nanos > 0L)
179		nanos = trip.awaitNanos(nanos);
180		} catch (InterruptedException ie) {
181		breakBarrier();
#	Line 189 | Line 189 | public class CyclicBarrier {
189		if (g < generation)
190		return index;
191
192	<	if (timed && nanos <= 0) {
192	>	if (timed && nanos <= 0L) {
193		breakBarrier();
194		throw new TimeoutException();
195		}
#	Line 297 | Line 297 | public class CyclicBarrier {
297		*/
298		public int await() throws InterruptedException, BrokenBarrierException {
299		try {
300	<	return dowait(false, 0);
300	>	return dowait(false, 0L);
301		} catch (TimeoutException toe) {
302		throw new Error(toe); // cannot happen;
303		}

Diff Legend

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