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.10 by tim, Sat Aug 23 19:47:29 2003 UTC vs.
Revision 1.11 by dholmes, Mon Aug 25 22:32:40 2003 UTC

#	Line 140 | Line 140 | public class CyclicBarrier {
140		/**
141		* Main barrier code, covering the various policies.
142		*/
143	<	private int dowait(boolean timed, long nanos) throws InterruptedException, BrokenBarrierException, TimeoutException {
143	>	private int dowait(boolean timed, long nanos)
144	>	throws InterruptedException, BrokenBarrierException, TimeoutException {
145		lock.lock();
146		try {
147		int index = --count;
#	Line 166 | Line 167 | public class CyclicBarrier {
167		broken = generation; // next generation is broken
168		throw ex;
169		}
170	+	catch (Error ex) {
171	+	broken = generation; // next generation is broken
172	+	throw ex;
173	+	}
174		}
175
176		while (generation == g) {
#	Line 357 | Line 362 | public class CyclicBarrier {
362		* interrupted while the current thread was waiting, or the barrier was
363		* reset, or the barrier was broken when <tt>await</tt> was called.
364		*/
365	<	public int await(long timeout, TimeUnit unit) throws InterruptedException, BrokenBarrierException, TimeoutException {
365	>	public int await(long timeout, TimeUnit unit)
366	>	throws InterruptedException,
367	>	BrokenBarrierException,
368	>	TimeoutException {
369		return dowait(true, unit.toNanos(timeout));
370		}
371
#	Line 413 | Line 421 | public class CyclicBarrier {
421		}
422
423		}
416	–
417	–

Diff Legend

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