--- old/jdk/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java Tue Jan 19 14:14:49 2016 +++ new/jdk/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java Tue Jan 19 14:14:49 2016 @@ -2429,7 +2429,7 @@ * * @param the type of the value * @return a new CompletableFuture - * @since 1.9 + * @since 9 */ public CompletableFuture newIncompleteFuture() { return new CompletableFuture(); @@ -2444,7 +2444,7 @@ * an Executor that provides at least one independent thread. * * @return the executor - * @since 1.9 + * @since 9 */ public Executor defaultExecutor() { return ASYNC_POOL; @@ -2462,7 +2462,7 @@ * arrange dependent actions. * * @return the new CompletableFuture - * @since 1.9 + * @since 9 */ public CompletableFuture copy() { return uniCopyStage(); @@ -2479,7 +2479,7 @@ * cause. * * @return the new CompletionStage - * @since 1.9 + * @since 9 */ public CompletionStage minimalCompletionStage() { return uniAsMinimalStage(); @@ -2494,7 +2494,7 @@ * to complete this CompletableFuture * @param executor the executor to use for asynchronous execution * @return this CompletableFuture - * @since 1.9 + * @since 9 */ public CompletableFuture completeAsync(Supplier supplier, Executor executor) { @@ -2512,7 +2512,7 @@ * @param supplier a function returning the value to be used * to complete this CompletableFuture * @return this CompletableFuture - * @since 1.9 + * @since 9 */ public CompletableFuture completeAsync(Supplier supplier) { return completeAsync(supplier, defaultExecutor()); @@ -2528,7 +2528,7 @@ * @param unit a {@code TimeUnit} determining how to interpret the * {@code timeout} parameter * @return this CompletableFuture - * @since 1.9 + * @since 9 */ public CompletableFuture orTimeout(long timeout, TimeUnit unit) { if (unit == null) @@ -2549,7 +2549,7 @@ * @param unit a {@code TimeUnit} determining how to interpret the * {@code timeout} parameter * @return this CompletableFuture - * @since 1.9 + * @since 9 */ public CompletableFuture completeOnTimeout(T value, long timeout, TimeUnit unit) { @@ -2573,7 +2573,7 @@ * {@code delay} parameter * @param executor the base executor * @return the new delayed executor - * @since 1.9 + * @since 9 */ public static Executor delayedExecutor(long delay, TimeUnit unit, Executor executor) { @@ -2592,7 +2592,7 @@ * @param unit a {@code TimeUnit} determining how to interpret the * {@code delay} parameter * @return the new delayed executor - * @since 1.9 + * @since 9 */ public static Executor delayedExecutor(long delay, TimeUnit unit) { if (unit == null) @@ -2608,7 +2608,7 @@ * @param value the value * @param the type of the value * @return the completed CompletionStage - * @since 1.9 + * @since 9 */ public static CompletionStage completedStage(U value) { return new MinimalStage((value == null) ? NIL : value); @@ -2621,7 +2621,7 @@ * @param ex the exception * @param the type of the value * @return the exceptionally completed CompletableFuture - * @since 1.9 + * @since 9 */ public static CompletableFuture failedFuture(Throwable ex) { if (ex == null) throw new NullPointerException(); @@ -2636,7 +2636,7 @@ * @param ex the exception * @param the type of the value * @return the exceptionally completed CompletionStage - * @since 1.9 + * @since 9 */ public static CompletionStage failedStage(Throwable ex) { if (ex == null) throw new NullPointerException();