aboutsummaryrefslogtreecommitdiff
path: root/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java
diff options
context:
space:
mode:
Diffstat (limited to 'guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java')
-rw-r--r--guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java b/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java
index 33403c978..eb3a24707 100644
--- a/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java
+++ b/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java
@@ -19,7 +19,6 @@ import static com.google.common.util.concurrent.Uninterruptibles.getUninterrupti
import com.google.common.annotations.GwtIncompatible;
import com.google.common.annotations.J2ktIncompatible;
-import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
@@ -162,10 +161,11 @@ public final class JdkFutureAdapters {
* to return a proper ListenableFuture instead of using listenInPoolThread.
*/
getUninterruptibly(delegate);
- } catch (ExecutionException | RuntimeException | Error e) {
- // (including CancellationException)
+ } catch (Throwable t) {
+ // (including CancellationException and sneaky checked exception)
// The task is presumably done, run the listeners.
- // TODO(cpovirk): Do *something* in case of Error (and maybe RuntimeException)?
+ // TODO(cpovirk): Do *something* in case of Error (and maybe
+ // non-CancellationException, non-ExecutionException exceptions)?
}
executionList.execute();
});