From 12bec39da12d1acde94e620b67bcc29ee5982c6f Mon Sep 17 00:00:00 2001 From: Alexander Blom Date: Tue, 15 Dec 2015 10:42:54 -0800 Subject: [PATCH] Fix cxxbridge usage of SettableFuture Reviewed By: mhorowitz Differential Revision: D2759591 fb-gh-sync-id: 920b4a5c934c1bd9d196ccbeec0799a54001b85d --- .../facebook/react/bridge/queue/MessageQueueThreadImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java index 453351632b..48328da25a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java @@ -10,8 +10,10 @@ package com.facebook.react.bridge.queue; import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import android.os.Looper; @@ -170,8 +172,8 @@ import com.facebook.react.common.futures.SimpleSettableFuture; name, simpleSettableFuture.get(5000, TimeUnit.MILLISECONDS), exceptionHandler); - } catch (Throwable t) { - throw new RuntimeException(t); + } catch (InterruptedException | ExecutionException | TimeoutException e) { + throw new RuntimeException(e); } } }