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.68 by jsr166, Sun Oct 9 22:51:42 2011 UTC vs.
Revision 1.69 by jsr166, Mon Oct 10 06:06:21 2011 UTC

#	Line 406 | Line 406 | public class Phaser {
406		int unarrived = counts & UNARRIVED_MASK;
407		if (registrations > MAX_PARTIES - parties)
408		throw new IllegalStateException(badRegister(s));
409	<	else if ((phase = (int)(s >>> PHASE_SHIFT)) < 0)
409	>	phase = (int)(s >>> PHASE_SHIFT);
410	>	if (phase < 0)
411		break;
412	<	else if (counts != EMPTY) {             // not 1st registration
412	>	if (counts != EMPTY) {                  // not 1st registration
413		if (parent == null || reconcileState() == s) {
414		if (unarrived == 0)             // wait out advance
415		root.internalAwaitAdvance(phase, null);

Diff Legend

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