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.51 by jsr166, Thu Jun 23 18:38:42 2011 UTC vs.
Revision 1.52 by jsr166, Thu Jun 30 15:16:32 2011 UTC

#	Line 695 | Line 695 | public abstract class ForkJoinTask<V> im
695		if (t != null) {
696		if (ex != null)
697		t.cancel(false);
698	<	else if (t.doJoin() < NORMAL && ex == null)
698	>	else if (t.doJoin() < NORMAL)
699		ex = t.getException();
700		}
701		}
#	Line 752 | Line 752 | public abstract class ForkJoinTask<V> im
752		if (t != null) {
753		if (ex != null)
754		t.cancel(false);
755	<	else if (t.doJoin() < NORMAL && ex == null)
755	>	else if (t.doJoin() < NORMAL)
756		ex = t.getException();
757		}
758		}

Diff Legend

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