ViewVC Help

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

root/jsr166/jsr166/src/main/java/util/concurrent/Phaser.java

Comparing jsr166/src/main/java/util/concurrent/Phaser.java (file contents):
Revision 1.64 by jsr166, Sun Oct 9 21:11:45 2011 UTC vs.
Revision 1.65 by jsr166, Sun Oct 9 21:18:37 2011 UTC

#	Line 358 | Line 358 | public class Phaser {
358		if (unarrived <= 0)
359		throw new IllegalStateException(badArrive(s));
360		if (UNSAFE.compareAndSwapLong(this, stateOffset, s, s-=adj)) {
361	–	long n = s & PARTIES_MASK;  // base of next state
362	–	int nextUnarrived = (int)n >>> PARTIES_SHIFT;
361		if (unarrived == 1) {
362	+	long n = s & PARTIES_MASK;  // base of next state
363	+	int nextUnarrived = (int)n >>> PARTIES_SHIFT;
364		if (root == this) {
365		if (onAdvance(phase, nextUnarrived))
366		n |= TERMINATION_BIT;

Diff Legend

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