Catch Throwable instead of Exception in as*Future

Fixes #469

Author: qwwdfsad

integration/kotlinx-coroutines-guava/src/ListenableFuture.kt

@@ -95,8 +95,8 @@ private class DeferredListenableFuture<T>(
         deferred.invokeOnCompletion {
             try {
                 set(deferred.getCompleted())
-            } catch (exception: Exception) {
-                setException(exception)
+            } catch (t: Throwable) {
+                setException(t)
             }
         }
     }

integration/kotlinx-coroutines-guava/test/ListenableFutureTest.kt

@@ -153,6 +153,21 @@ class ListenableFutureTest : TestBase() {
         finish(4)
     }
 
+    @Test
+    fun testAsListenableFutureThrowable() {
+        val deferred = async {
+            throw OutOfMemoryError()
+        }
+
+        val future = deferred.asListenableFuture()
+        try {
+            future.get()
+        } catch (e: ExecutionException) {
+            assertTrue(future.isDone)
+            assertTrue(e.cause is OutOfMemoryError)
+        }
+    }
+
     @Test
     fun testCancellableAwait() = runBlocking {
         expect(1)

integration/kotlinx-coroutines-jdk8/src/future/Future.kt

@@ -93,8 +93,8 @@ public fun <T> Deferred<T>.asCompletableFuture(): CompletableFuture<T> {
     invokeOnCompletion {
         try {
             future.complete(getCompleted())
-        } catch (exception: Exception) {
-            future.completeExceptionally(exception)
+        } catch (t: Throwable) {
+            future.completeExceptionally(t)
         }
     }
     return future

integration/kotlinx-coroutines-jdk8/test/FutureTest.kt

@@ -21,16 +21,6 @@ class FutureTest : TestBase() {
         ignoreLostThreads("ForkJoinPool.commonPool-worker-")
     }
 
-    @Test
-    fun testSimpleAwait() {
-        val future = future {
-            CompletableFuture.supplyAsync {
-                "O"
-            }.await() + "K"
-        }
-        assertThat(future.get(), IsEqual("OK"))
-    }
-
     @Test
     fun testCompletedFuture() {
         val toAwait = CompletableFuture<String>()
@@ -186,6 +176,21 @@ class FutureTest : TestBase() {
         finish(4)
     }
 
+    @Test
+    fun testAsCompletableFutureThrowable() {
+        val deferred = async {
+            throw OutOfMemoryError()
+        }
+
+        val future = deferred.asCompletableFuture()
+        try {
+            future.get()
+        } catch (e: ExecutionException) {
+            assertTrue(future.isCompletedExceptionally)
+            assertTrue(e.cause is OutOfMemoryError)
+        }
+    }
+
     @Test
     fun testCancellableAwaitFuture() = runBlocking {
         expect(1)