In case catch Throwable didn't catch everything?

Stephane Landelle · Stephane Landelle · commit 6cfd1b5653dd · 2013-09-18T14:46:01.000+02:00
diff --git a/providers/netty/src/main/java/org/asynchttpclient/providers/netty/NettyResponseFuture.java b/providers/netty/src/main/java/org/asynchttpclient/providers/netty/NettyResponseFuture.java
@@ -245,10 +245,9 @@ public V get(long l, TimeUnit tu) throws InterruptedException, TimeoutException,
                         asyncHandler.onThrowable(te);
                     } catch (Throwable t) {
                         logger.debug("asyncHandler.onThrowable", t);
-                    } finally {
-                        cancelReaper();
-                        throw new ExecutionException(te);
                     }
+                    cancelReaper();
+                    throw new ExecutionException(te);
                 }
             }
             isDone.set(true);
@@ -279,10 +278,9 @@ V getContent() throws ExecutionException {
                         asyncHandler.onThrowable(ex);
                     } catch (Throwable t) {
                         logger.debug("asyncHandler.onThrowable", t);
-                    } finally {
-                        cancelReaper();
-                        throw new RuntimeException(ex);
                     }
+                    cancelReaper();
+                    throw new RuntimeException(ex);
                 }
             }
             content.compareAndSet(null, update);
@@ -303,8 +301,8 @@ public final void done() {
         } catch (ExecutionException t) {
             return;
         } catch (RuntimeException t) {
-        	Throwable exception = t.getCause() != null ? t.getCause() : t;
-        	exEx.compareAndSet(null, new ExecutionException(exception));
+            Throwable exception = t.getCause() != null ? t.getCause() : t;
+            exEx.compareAndSet(null, new ExecutionException(exception));
 
         } finally {
             latch.countDown();
@@ -471,7 +469,8 @@ public void setRequest(Request request) {
     }
 
     /**
-     * Return true if the {@link Future} cannot be recovered. There is some scenario where a connection can be closed by an unexpected IOException, and in some situation we can recover from that exception.
+     * Return true if the {@link Future} cannot be recovered. There is some scenario where a connection can be closed by an unexpected IOException, and in some situation we can
+     * recover from that exception.
      * 
      * @return true if that {@link Future} cannot be recovered.
      */
diff --git a/providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyResponseFuture.java b/providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyResponseFuture.java
@@ -230,10 +230,9 @@ public V get(long l, TimeUnit tu) throws InterruptedException, TimeoutException,
                         asyncHandler.onThrowable(te);
                     } catch (Throwable t) {
                         logger.debug("asyncHandler.onThrowable", t);
-                    } finally {
-                        cancelReaper();
-                        throw new ExecutionException(te);
                     }
+                    cancelReaper();
+                    throw new ExecutionException(te);
                 }
             }
             isDone.set(true);
@@ -264,10 +263,9 @@ public V getContent() throws ExecutionException {
                         asyncHandler.onThrowable(ex);
                     } catch (Throwable t) {
                         logger.debug("asyncHandler.onThrowable", t);
-                    } finally {
-                        cancelReaper();
-                        throw new RuntimeException(ex);
                     }
+                    cancelReaper();
+                    throw new RuntimeException(ex);
                 }
             }
             content.compareAndSet(null, update);

Original file line number	Diff line number	Diff line change
`@@ -245,10 +245,9 @@ public V get(long l, TimeUnit tu) throws InterruptedException, TimeoutException,`
`245`	`245`	`asyncHandler.onThrowable(te);`
`246`	`246`	`} catch (Throwable t) {`
`247`	`247`	`logger.debug("asyncHandler.onThrowable", t);`
`248`		`- } finally {`
`249`		`- cancelReaper();`
`250`		`- throw new ExecutionException(te);`
`251`	`248`	`}`
	`249`	`+ cancelReaper();`
	`250`	`+ throw new ExecutionException(te);`
`252`	`251`	`}`
`253`	`252`	`}`
`254`	`253`	`isDone.set(true);`
`@@ -279,10 +278,9 @@ V getContent() throws ExecutionException {`
`279`	`278`	`asyncHandler.onThrowable(ex);`
`280`	`279`	`} catch (Throwable t) {`
`281`	`280`	`logger.debug("asyncHandler.onThrowable", t);`
`282`		`- } finally {`
`283`		`- cancelReaper();`
`284`		`- throw new RuntimeException(ex);`
`285`	`281`	`}`
	`282`	`+ cancelReaper();`
	`283`	`+ throw new RuntimeException(ex);`
`286`	`284`	`}`
`287`	`285`	`}`
`288`	`286`	`content.compareAndSet(null, update);`
`@@ -303,8 +301,8 @@ public final void done() {`
`303`	`301`	`} catch (ExecutionException t) {`
`304`	`302`	`return;`
`305`	`303`	`} catch (RuntimeException t) {`
`306`		`- Throwable exception = t.getCause() != null ? t.getCause() : t;`
`307`		`- exEx.compareAndSet(null, new ExecutionException(exception));`
	`304`	`+ Throwable exception = t.getCause() != null ? t.getCause() : t;`
	`305`	`+ exEx.compareAndSet(null, new ExecutionException(exception));`
`308`	`306`
`309`	`307`	`} finally {`
`310`	`308`	`latch.countDown();`
`@@ -471,7 +469,8 @@ public void setRequest(Request request) {`
`471`	`469`	`}`
`472`	`470`
`473`	`471`	`/**`
`474`		`- * Return true if the {@link Future} cannot be recovered. There is some scenario where a connection can be closed by an unexpected IOException, and in some situation we can recover from that exception.`
	`472`	`+ * Return true if the {@link Future} cannot be recovered. There is some scenario where a connection can be closed by an unexpected IOException, and in some situation we can`
	`473`	`+ * recover from that exception.`
`475`	`474`	`*`
`476`	`475`	`* @return true if that {@link Future} cannot be recovered.`
`477`	`476`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -230,10 +230,9 @@ public V get(long l, TimeUnit tu) throws InterruptedException, TimeoutException,`
`230`	`230`	`asyncHandler.onThrowable(te);`
`231`	`231`	`} catch (Throwable t) {`
`232`	`232`	`logger.debug("asyncHandler.onThrowable", t);`
`233`		`- } finally {`
`234`		`- cancelReaper();`
`235`		`- throw new ExecutionException(te);`
`236`	`233`	`}`
	`234`	`+ cancelReaper();`
	`235`	`+ throw new ExecutionException(te);`
`237`	`236`	`}`
`238`	`237`	`}`
`239`	`238`	`isDone.set(true);`
`@@ -264,10 +263,9 @@ public V getContent() throws ExecutionException {`
`264`	`263`	`asyncHandler.onThrowable(ex);`
`265`	`264`	`} catch (Throwable t) {`
`266`	`265`	`logger.debug("asyncHandler.onThrowable", t);`
`267`		`- } finally {`
`268`		`- cancelReaper();`
`269`		`- throw new RuntimeException(ex);`
`270`	`266`	`}`
	`267`	`+ cancelReaper();`
	`268`	`+ throw new RuntimeException(ex);`
`271`	`269`	`}`
`272`	`270`	`}`
`273`	`271`	`content.compareAndSet(null, update);`