Make sure a cancel exception won't hide the expected one

Author: Stephane Landelle

providers/netty/src/main/java/org/asynchttpclient/providers/netty/future/NettyResponseFuture.java

@@ -234,12 +234,15 @@ public V get(long l, TimeUnit tu) throws InterruptedException, TimeoutException,
                 TimeoutException te = new TimeoutException(String.format("No response received after %s %s", l, tu.name().toLowerCase()));
                 if (!throwableCalled.getAndSet(true)) {
                     try {
-                        asyncHandler.onThrowable(te);
-                    } catch (Throwable t) {
-                        logger.debug("asyncHandler.onThrowable", t);
+                        try {
+                            asyncHandler.onThrowable(te);
+                        } catch (Throwable t) {
+                            logger.debug("asyncHandler.onThrowable", t);
+                        }
+                        throw new ExecutionException(te);
+                    } finally {
+                        cancelReaper();
                     }
-                    cancelReaper();
-                    throw new ExecutionException(te);
                 }
             }
             isDone.set(true);
@@ -267,12 +270,15 @@ private V getContent() throws ExecutionException {
             } catch (Throwable ex) {
                 if (!throwableCalled.getAndSet(true)) {
                     try {
-                        asyncHandler.onThrowable(ex);
-                    } catch (Throwable t) {
-                        logger.debug("asyncHandler.onThrowable", t);
+                        try {
+                            asyncHandler.onThrowable(ex);
+                        } catch (Throwable t) {
+                            logger.debug("asyncHandler.onThrowable", t);
+                        }
+                        throw new RuntimeException(ex);
+                    } finally {
+                        cancelReaper();
                     }
-                    cancelReaper();
-                    throw new RuntimeException(ex);
                 }
             }
             content.compareAndSet(null, update);