--- jsr166/src/jsr166e/ForkJoinPool.java 2013/01/02 07:43:50 1.41 +++ jsr166/src/jsr166e/ForkJoinPool.java 2013/01/04 18:52:18 1.44 @@ -2555,10 +2555,11 @@ public class ForkJoinPool extends Abstra * ongoing processing are automatically terminated upon program * {@link System#exit}. Any program that relies on asynchronous * task processing to complete before program termination should - * invoke {@link #quiesceCommonPool}, or the timeout-based {@code - * commonPool().}{@link #awaitQuiescence}, before exit. + * invoke {@code commonPool().}{@link #awaitQuiescence}, before + * exit. * * @return the common pool instance + * @since 1.8 */ public static ForkJoinPool commonPool() { // assert common != null : "static init error"; @@ -2741,6 +2742,7 @@ public class ForkJoinPool extends Abstra * Returns the targeted parallelism level of the common pool. * * @return the targeted parallelism level of the common pool + * @since 1.8 */ public static int getCommonPoolParallelism() { return commonParallelism; @@ -3001,7 +3003,7 @@ public class ForkJoinPool extends Abstra * Possibly initiates an orderly shutdown in which previously * submitted tasks are executed, but no new tasks will be * accepted. Invocation has no effect on execution state if this - * is the {@link #commonPool}, and no additional effect if + * is the {@link #commonPool()}, and no additional effect if * already shut down. Tasks that are in the process of being * submitted concurrently during the course of this method may or * may not be rejected. @@ -3019,7 +3021,7 @@ public class ForkJoinPool extends Abstra /** * Possibly attempts to cancel and/or stop all tasks, and reject * all subsequently submitted tasks. Invocation has no effect on - * execution state if this is the {@link #commonPool}, and no + * execution state if this is the {@link #commonPool()}, and no * additional effect if already shut down. Otherwise, tasks that * are in the process of being submitted or executed concurrently * during the course of this method may or may not be @@ -3171,7 +3173,7 @@ public class ForkJoinPool extends Abstra * Waits and/or attempts to assist performing tasks indefinitely * until the {@link #commonPool()} {@link #isQuiescent} */ - public static void quiesceCommonPool() { + static void quiesceCommonPool() { common.awaitQuiescence(Long.MAX_VALUE, TimeUnit.NANOSECONDS); }