ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/jsr166y/Phaser.java
(Generate patch)

Comparing jsr166/src/jsr166y/Phaser.java (file contents):
Revision 1.29 by jsr166, Wed Aug 12 04:02:45 2009 UTC vs.
Revision 1.30 by dl, Wed Aug 19 15:23:18 2009 UTC

# Line 535 | Line 535 | public class Phaser {
535  
536      /**
537       * Awaits the phase of the barrier to advance from the given phase
538 <     * value, or returns immediately if the current phase of the barrier
539 <     * is not equal to the given phase value or this barrier is
540 <     * terminated.
538 >     * value, returning immediately if the current phase of the
539 >     * barrier is not equal to the given phase value or this barrier
540 >     * is terminated.
541       *
542       * @param phase the phase on entry to this method
543       * @return the phase on exit from this method
# Line 556 | Line 556 | public class Phaser {
556      }
557  
558      /**
559 <     * Awaits the phase of the barrier to advance from the given
560 <     * value, or returns immediately if argument is negative or this
561 <     * barrier is terminated, or throws InterruptedException if
562 <     * interrupted while waiting.
559 >     * Awaits the phase of the barrier to advance from the given phase
560 >     * value, throwing InterruptedException if interrupted while
561 >     * waiting, or returning immediately if the current phase of the
562 >     * barrier is not equal to the given phase value or this barrier
563 >     * is terminated
564       *
565       * @param phase the phase on entry to this method
566       * @return the phase on exit from this method
# Line 579 | Line 580 | public class Phaser {
580      }
581  
582      /**
583 <     * Awaits the phase of the barrier to advance from the given value
584 <     * or the given timeout elapses, or returns immediately if
585 <     * argument is negative or this barrier is terminated.
583 >     * Awaits the phase of the barrier to advance from the given phase
584 >     * value or the given timeout elapses, throwing
585 >     * InterruptedException if interrupted while waiting, or returning
586 >     * immediately if the current phase of the barrier is not equal to
587 >     * the given phase value or this barrier is terminated.
588       *
589       * @param phase the phase on entry to this method
590       * @return the phase on exit from this method

Diff Legend

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