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.48 by jsr166, Sun May 18 23:47:56 2008 UTC vs.
Revision 1.49 by jsr166, Mon May 19 01:13:14 2008 UTC

# Line 673 | Line 673 | public class ScheduledThreadPoolExecutor
673  
674      /**
675       * Initiates an orderly shutdown in which previously submitted
676 <     * tasks are executed, but no new tasks will be accepted.  If the
677 <     * {@code ExecuteExistingDelayedTasksAfterShutdownPolicy} has
678 <     * been set {@code false}, existing delayed tasks whose delays
679 <     * have not yet elapsed are cancelled.  And unless the
680 <     * {@code ContinueExistingPeriodicTasksAfterShutdownPolicy} has
681 <     * been set {@code true}, future executions of existing periodic
682 <     * tasks will be cancelled.
676 >     * tasks are executed, but no new tasks will be accepted.
677 >     * Invocation has no additional effect if already shut down.
678 >     *
679 >     * <p>This method does not wait for previously submitted tasks to
680 >     * complete execution.  Use {@link #awaitTermination awaitTermination}
681 >     * to do that.
682 >     *
683 >     * <p>If the {@code ExecuteExistingDelayedTasksAfterShutdownPolicy}
684 >     * has been set {@code false}, existing delayed tasks whose delays
685 >     * have not yet elapsed are cancelled.  And unless the {@code
686 >     * ContinueExistingPeriodicTasksAfterShutdownPolicy} has been set
687 >     * {@code true}, future executions of existing periodic tasks will
688 >     * be cancelled.
689       *
690       * @throws SecurityException {@inheritDoc}
691       */
# Line 692 | Line 698 | public class ScheduledThreadPoolExecutor
698       * processing of waiting tasks, and returns a list of the tasks
699       * that were awaiting execution.
700       *
701 +     * <p>This method does not wait for actively executing tasks to
702 +     * terminate.  Use {@link #awaitTermination awaitTermination} to
703 +     * do that.
704 +     *
705       * <p>There are no guarantees beyond best-effort attempts to stop
706       * processing actively executing tasks.  This implementation
707       * cancels tasks via {@link Thread#interrupt}, so any task that

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines