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

Comparing jsr166/src/main/java/util/concurrent/ExecutorService.java (file contents):
Revision 1.48 by jsr166, Mon Jul 17 02:55:01 2006 UTC vs.
Revision 1.49 by jsr166, Mon May 19 01:09:45 2008 UTC

# Line 116 | Line 116 | public interface ExecutorService extends
116       * tasks are executed, but no new tasks will be accepted.
117       * Invocation has no additional effect if already shut down.
118       *
119 +     * <p>This method does not wait for previously submitted tasks to
120 +     * complete execution.  Use {@link #awaitTermination awaitTermination}
121 +     * to do that.
122 +     *
123       * @throws SecurityException if a security manager exists and
124       *         shutting down this ExecutorService may manipulate
125       *         threads that the caller is not permitted to modify
# Line 128 | Line 132 | public interface ExecutorService extends
132  
133      /**
134       * Attempts to stop all actively executing tasks, halts the
135 <     * processing of waiting tasks, and returns a list of the tasks that were
136 <     * awaiting execution.
135 >     * processing of waiting tasks, and returns a list of the tasks
136 >     * that were awaiting execution.
137 >     *
138 >     * <p>This method does not wait for actively executing tasks to
139 >     * terminate.  Use {@link #awaitTermination awaitTermination} to
140 >     * do that.
141       *
142       * <p>There are no guarantees beyond best-effort attempts to stop
143       * processing actively executing tasks.  For example, typical

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines