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.87 by dl, Mon Jul 7 18:29:07 2014 UTC vs.
Revision 1.88 by jsr166, Mon Jul 7 19:06:46 2014 UTC

#	Line 996 | Line 996 | public abstract class ForkJoinTask<V> im
996		throw new InterruptedException();
997		if ((s = status) >= 0 && nanos > 0L) {
998		long d = System.nanoTime() + nanos;
999	<	long deadline = (d == 0L)? 1L : d; // avoid 0
999	>	long deadline = (d == 0L) ? 1L : d; // avoid 0
1000		Thread t = Thread.currentThread();
1001		if (t instanceof ForkJoinWorkerThread) {
1002		ForkJoinWorkerThread wt = (ForkJoinWorkerThread)t;

Diff Legend

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