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.95 by jsr166, Mon Nov 26 14:11:54 2012 UTC vs.
Revision 1.96 by dl, Wed Dec 19 00:02:59 2012 UTC

#	Line 978 | Line 978 | public abstract class ForkJoinTask<V> im
978		if (Thread.interrupted())
979		throw new InterruptedException();
980		// Messy in part because we measure in nanosecs, but wait in millisecs
981	<	int s; long ns, ms;
982	<	if ((s = status) >= 0 && (ns = unit.toNanos(timeout)) > 0L) {
981	>	int s; long ms;
982	>	long ns = unit.toNanos(timeout);
983	>	if ((s = status) >= 0 && ns > 0L) {
984		long deadline = System.nanoTime() + ns;
985		ForkJoinPool p = null;
986		ForkJoinPool.WorkQueue w = null;

Diff Legend

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