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.45 by jsr166, Wed Jan 16 01:59:47 2013 UTC vs.
Revision 1.46 by jsr166, Tue Feb 5 19:00:18 2013 UTC

#	Line 326 | Line 326 | public class CyclicBarrier {
326		*         interrupted or timed out while the current thread was
327		*         waiting, or the barrier was reset, or the barrier was
328		*         broken when {@code await} was called, or the barrier
329	<	*         action (if present) failed due an exception.
329	>	*         action (if present) failed due to an exception.
330		*/
331		public int await() throws InterruptedException, BrokenBarrierException {
332		try {
#	Line 396 | Line 396 | public class CyclicBarrier {
396		*         interrupted or timed out while the current thread was
397		*         waiting, or the barrier was reset, or the barrier was broken
398		*         when {@code await} was called, or the barrier action (if
399	<	*         present) failed due an exception
399	>	*         present) failed due to an exception
400		*/
401		public int await(long timeout, TimeUnit unit)
402		throws InterruptedException,

Diff Legend

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