ViewVC Help

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

root/jsr166/jsr166/src/jsr166y/Phaser.java

Comparing jsr166/src/jsr166y/Phaser.java (file contents):
Revision 1.51 by dl, Sat Nov 13 00:55:51 2010 UTC vs.
Revision 1.53 by jsr166, Sat Nov 13 05:59:25 2010 UTC

#	Line 836 | Line 836 | public class Phaser {
836		* Possibly blocks and waits for phase to advance unless aborted.
837		*
838		* @param phase current phase
839	<	* @param node if nonnull, the wait node to track interrupt and timeout;
839	>	* @param node if non-null, the wait node to track interrupt and timeout;
840		* if null, denotes noninterruptible wait
841		* @return current phase
842		*/
#	Line 880 | Line 880 | public class Phaser {
880		if (!node.interruptible && node.wasInterrupted)
881		Thread.currentThread().interrupt();
882		}
883	<	if (p == phase && parent != null)
883	>	if (p == phase)
884		p = (int)(reconcileState() >>> PHASE_SHIFT);
885		if (p != phase)
886		releaseWaiters(phase);

Diff Legend

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