ViewVC Help

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

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

Comparing jsr166/src/main/java/util/concurrent/ForkJoinTask.java (file contents):
Revision 1.24 by jsr166, Tue Sep 7 23:17:10 2010 UTC vs.
Revision 1.25 by jsr166, Tue Sep 14 19:37:57 2010 UTC

#	Line 640 | Line 640 | public abstract class ForkJoinTask<V> im
640		setCompletion(NORMAL);
641		}
642
643	+	/**
644	+	* @throws CancellationException {@inheritDoc}
645	+	*/
646		public final V get() throws InterruptedException, ExecutionException {
647		quietlyJoin();
648		if (Thread.interrupted())
#	Line 655 | Line 658 | public abstract class ForkJoinTask<V> im
658		return getRawResult();
659		}
660
661	+	/**
662	+	* @throws CancellationException {@inheritDoc}
663	+	*/
664		public final V get(long timeout, TimeUnit unit)
665		throws InterruptedException, ExecutionException, TimeoutException {
666		Thread t = Thread.currentThread();

Diff Legend

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