Minor changes on previous commit.

Author: rlubke

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/EventHandler.java

@@ -378,39 +378,48 @@ public boolean onHttpPacketParsed(HttpHeader httpHeader, FilterChainContext ctx)
         }
 
         result = false;
-
+        final HttpResponsePacket response =
+                (HttpResponsePacket) httpHeader;
         final HttpTransactionContext context = HttpTransactionContext.get(ctx.getConnection());
-        if (context.isEstablishingTunnel()
-                && HttpStatus.OK_200.statusMatches(
-                    ((HttpResponsePacket) httpHeader).getStatus())) {
-            context.setEstablishingTunnel(false);
-            final Connection c = ctx.getConnection();
-            context.tunnelEstablished(c);
-            context.getProvider().execute(c,
-                                          context.getRequest(),
-                                          context.getHandler(),
-                                          context.getFuture());
-            return result;
-        } else {
-            cleanup(ctx);
-            final AsyncHandler handler = context.getHandler();
-            if (handler != null) {
-                try {
-                    context.result(handler.onCompleted());
-                } catch (Exception e) {
-                    context.abort(e);
-                }
+        try {
+            if (context.isEstablishingTunnel()
+                    && HttpStatus.OK_200.statusMatches(response.getStatus())) {
+                context.setEstablishingTunnel(false);
+                final Connection c = ctx.getConnection();
+                context.tunnelEstablished(c);
+                context.getProvider().execute(c,
+                                              context.getRequest(),
+                                              context.getHandler(),
+                                              context.getFuture());
+                return result;
             } else {
-                context.done(null);
+                cleanup(ctx);
+                final AsyncHandler handler = context.getHandler();
+                if (handler != null) {
+                    try {
+                        context.result(handler.onCompleted());
+                    } catch (Exception e) {
+                        context.abort(e);
+                    }
+                } else {
+                    context.done(null);
+                }
+                return result;
             }
-
-            return result;
+        } finally {
+            recycleResponsePacket(response);
         }
+
     }
 
 
     // ----------------------------------------------------- Private Methods
 
+    private static void recycleResponsePacket(final HttpResponsePacket response) {
+        response.getRequest().setExpectContent(false);
+        response.recycle();
+    }
+
     private static void processKeepAlive(final Connection c,
                                          final HttpHeader header) {
         final ProcessingState state = header.getProcessingState();

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/filters/AsyncHttpClientEventFilter.java

@@ -82,11 +82,7 @@ protected void onHttpHeadersParsed(HttpHeader httpHeader, FilterChainContext ctx
 
     @Override
     protected boolean onHttpPacketParsed(HttpHeader httpHeader, FilterChainContext ctx) {
-        boolean result = eventHandler.onHttpPacketParsed(httpHeader, ctx);
-        HttpResponsePacket response = (HttpResponsePacket) httpHeader;
-        response.getRequest().setExpectContent(false);
-        response.recycle();
-        return result;
+        return eventHandler.onHttpPacketParsed(httpHeader, ctx);
     }
 
     @Override