ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/concurrent/ScheduledThreadPoolExecutor.java
(Generate patch)

Comparing jsr166/src/main/java/util/concurrent/ScheduledThreadPoolExecutor.java (file contents):
Revision 1.83 by jsr166, Wed Dec 31 07:54:14 2014 UTC vs.
Revision 1.84 by jsr166, Thu Jan 15 19:29:22 2015 UTC

# Line 42 | Line 42 | import java.util.concurrent.locks.Reentr
42   * removed from the work queue at time of cancellation.
43   *
44   * <p>Successive executions of a periodic task scheduled via
45 < * {@link #scheduleAtFixedRate} or
46 < * {@link #scheduleWithFixedDelay} do not overlap. While different
47 < * executions may be performed by different threads, the effects of
48 < * prior executions <a
49 < * href="package-summary.html#MemoryVisibility"><i>happen-before</i></a>
45 > * {@link #scheduleAtFixedRate scheduleAtFixedRate} or
46 > * {@link #scheduleWithFixedDelay scheduleWithFixedDelay}
47 > * do not overlap. While different executions may be performed by
48 > * different threads, the effects of prior executions
49 > * <a href="package-summary.html#MemoryVisibility"><i>happen-before</i></a>
50   * those of subsequent ones.
51   *
52   * <p>While this class inherits from {@link ThreadPoolExecutor}, a few
# Line 780 | Line 780 | public class ScheduledThreadPoolExecutor
780       *         For tasks submitted via one of the {@code schedule}
781       *         methods, the element will be identical to the returned
782       *         {@code ScheduledFuture}.  For tasks submitted using
783 <     *         {@link #execute}, the element will be a zero-delay {@code
784 <     *         ScheduledFuture}.
783 >     *         {@link #execute execute}, the element will be a
784 >     *         zero-delay {@code ScheduledFuture}.
785       * @throws SecurityException {@inheritDoc}
786       */
787      public List<Runnable> shutdownNow() {
# Line 793 | Line 793 | public class ScheduledThreadPoolExecutor
793       * Each element of this list is a {@link ScheduledFuture}.
794       * For tasks submitted via one of the {@code schedule} methods, the
795       * element will be identical to the returned {@code ScheduledFuture}.
796 <     * For tasks submitted using {@link #execute}, the element will be a
797 <     * zero-delay {@code ScheduledFuture}.
796 >     * For tasks submitted using {@link #execute execute}, the element
797 >     * will be a zero-delay {@code ScheduledFuture}.
798       *
799       * <p>Iteration over this queue is <em>not</em> guaranteed to traverse
800       * tasks in the order in which they will execute.

Diff Legend

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