ViewVC Help

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

root/jsr166/jsr166/src/jsr166y/ForkJoinTask.java

Comparing jsr166/src/jsr166y/ForkJoinTask.java (file contents):
Revision 1.97 by jsr166, Sun Dec 30 02:05:53 2012 UTC vs.
Revision 1.98 by dl, Tue Jan 1 15:10:39 2013 UTC

#	Line 606 | Line 606 | public abstract class ForkJoinTask<V> im
606		throw (Error)ex;
607		if (ex instanceof RuntimeException)
608		throw (RuntimeException)ex;
609	<	throw uncheckedThrowable(ex, RuntimeException.class);
609	>	ForkJoinTask.<RuntimeException>uncheckedThrow(ex);
610		}
611		}
612
#	Line 616 | Line 616 | public abstract class ForkJoinTask<V> im
616		* unchecked exceptions
617		*/
618		@SuppressWarnings("unchecked") static <T extends Throwable>
619	<	T uncheckedThrowable(final Throwable t, final Class<T> c) {
620	<	return (T)t; // rely on vacuous cast
619	>	void uncheckedThrow(Throwable t) throws T {
620	>	if (t != null)
621	>	throw (T)t; // rely on vacuous cast
622		}
623
624		/**
#	Line 652 | Line 653 | public abstract class ForkJoinTask<V> im
653		if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
654		((ForkJoinWorkerThread)t).workQueue.push(this);
655		else
656	<	ForkJoinPool.commonPool.externalPush(this);
656	>	ForkJoinPool.common.externalPush(this);
657		return this;
658		}
659
#	Line 1076 | Line 1077 | public abstract class ForkJoinTask<V> im
1077		wt.pool.helpQuiescePool(wt.workQueue);
1078		}
1079		else
1080	<	ForkJoinPool.externalHelpQuiescePool();
1080	>	ForkJoinPool.quiesceCommonPool();
1081		}
1082
1083		/**
#	Line 1501 | Line 1502 | public abstract class ForkJoinTask<V> im
1502		}
1503		}
1504		}
1505	+
1506		}

Diff Legend

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