diff --git a/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java b/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java index 5576d09d800f..5969c4ff7d2e 100644 --- a/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java @@ -137,8 +137,9 @@ *
{@code * FluentFutureuserName = @@ -983,9 +984,14 @@ public String toString() { } /** - * Marks this step as the last step in the {@code ClosingFuture} pipeline. When the returned - * {@link Future} is done, all objects captured for closing during the pipeline's computation will - * be closed. + * Marks this step as the last step in the {@code ClosingFuture} pipeline. + * + * The returned {@link Future} is completed when the pipeline's computation completes, or when + * the pipeline is cancelled. + * + *
All objects the pipeline has captured for closing will begin to be closed asynchronously + * after the returned {@code Future} is done: the future completes before closing starts, + * rather than once it has finished. * *
After calling this method, you may not call {@link * #finishToValueAndCloser(ValueAndCloserConsumer, Executor)}, this method, or any other diff --git a/guava/src/com/google/common/util/concurrent/ClosingFuture.java b/guava/src/com/google/common/util/concurrent/ClosingFuture.java index 7aca5b92d4e8..09767dc00fd4 100644 --- a/guava/src/com/google/common/util/concurrent/ClosingFuture.java +++ b/guava/src/com/google/common/util/concurrent/ClosingFuture.java @@ -136,8 +136,9 @@ *
Automatically closing
* * You can extract a {@link Future} that represents the result of the last step in the pipeline by - * calling {@link #finishToFuture()}. When that final {@link Future} is done, all objects captured - * by all steps in the pipeline will be closed. + * calling {@link #finishToFuture()}. All objects the pipeline has captured for closing will begin + * to be closed asynchronously after the returned {@code Future} is done: the future + * completes before closing starts, rather than once it has finished. * *{@code * FluentFutureuserName = @@ -983,9 +984,14 @@ public String toString() { } /** - * Marks this step as the last step in the {@code ClosingFuture} pipeline. When the returned - * {@link Future} is done, all objects captured for closing during the pipeline's computation will - * be closed. + * Marks this step as the last step in the {@code ClosingFuture} pipeline. + * + * The returned {@link Future} is completed when the pipeline's computation completes, or when + * the pipeline is cancelled. + * + *
All objects the pipeline has captured for closing will begin to be closed asynchronously + * after the returned {@code Future} is done: the future completes before closing starts, + * rather than once it has finished. * *
After calling this method, you may not call {@link * #finishToValueAndCloser(ValueAndCloserConsumer, Executor)}, this method, or any other