Fix semaphore not being released on Throwable, see AsyncHttpClient#1314

slandelle · slandelle · commit 4dbf11c19805 · 2017-01-12T22:17:55.000+01:00
Motivation: Fix for AsyncHttpClient#1314 introduced a regression where the Semaphore leaks and is not released on Throwable. Modification: Release Semaphore when called handler method is onThrowable too, not only onComplete. Result No more Semaphore leak
diff --git a/client/src/main/java/org/asynchttpclient/filter/ReleasePermitOnComplete.java b/client/src/main/java/org/asynchttpclient/filter/ReleasePermitOnComplete.java
@@ -11,13 +11,16 @@
 import org.asynchttpclient.AsyncHandler;
 
 /**
- * Wrapper for {@link AsyncHandler}s to release a permit on {@link AsyncHandler#onCompleted()}.
- * This is done via a dynamic proxy to preserve all interfaces of the wrapped handler.
+ * Wrapper for {@link AsyncHandler}s to release a permit on {@link AsyncHandler#onCompleted()}. This is done via a dynamic proxy to preserve all interfaces of the wrapped handler.
  */
 public class ReleasePermitOnComplete {
 
     /**
      * Wrap handler to release the permit of the semaphore on {@link AsyncHandler#onCompleted()}.
+     * 
+     * @param handler the handler to be wrapped
+     * @param available the Semaphore to be released when the wrapped handler is completed
+     * @return the wrapped handler
      */
     @SuppressWarnings("unchecked")
     public static <T> AsyncHandler<T> wrap(final AsyncHandler<T> handler, final Semaphore available) {
@@ -31,8 +34,11 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
                 try {
                     return method.invoke(handler, args);
                 } finally {
-                    if ("onCompleted".equals(method.getName())) {
+                    switch (method.getName()) {
+                    case "onCompleted":
+                    case "onThrowable":
                         available.release();
+                    default:
                     }
                 }
             }
@@ -41,6 +47,8 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 
     /**
      * Extract all interfaces of a class.
+     * @param handlerClass the handler class
+     * @return all interfaces implemented by this class
      */
     static Class<?>[] allInterfaces(Class<?> handlerClass) {
         Set<Class<?>> allInterfaces = new HashSet<>();
