ViewVC Help

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

root/jsr166/jsr166/src/jsr166y/ForkJoinWorkerThread.java

Comparing jsr166/src/jsr166y/ForkJoinWorkerThread.java (file contents):
Revision 1.55 by dl, Wed Nov 17 15:36:39 2010 UTC vs.
Revision 1.56 by jsr166, Thu Nov 18 00:39:15 2010 UTC

#	Line 940 | Line 940 | public class ForkJoinWorkerThread extend
940		UNSAFE.putOrderedObject(this, currentJoinOffset, joinMe);
941		if (isTerminating())                // cancel if shutting down
942		joinMe.cancelIgnoringExceptions();
943	<	else
943	>	else
944		pool.awaitJoin(joinMe, this, timed, nanos);
945		UNSAFE.putOrderedObject(this, currentJoinOffset, prevJoin);
946		}

Diff Legend

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