Remove tunnel establishment checks. They are no longer needed as tunnelling is established when the connection is established.

Author: rlubke

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

@@ -150,9 +150,6 @@ public void onInitialLineParsed(HttpHeader httpHeader,
         final HttpTransactionContext context =
                 HttpTransactionContext.get(connection);
         final int status = ((HttpResponsePacket) httpHeader).getStatus();
-        if (context.isEstablishingTunnel() && HttpStatus.OK_200.statusMatches(status)) {
-            return;
-        }
         if (HttpStatus.CONINTUE_100.statusMatches(status)) {
             ctx.notifyUpstream(new ContinueEvent(context));
             return;
@@ -239,9 +236,7 @@ public void onHttpHeadersParsed(HttpHeader httpHeader,
         processKeepAlive(ctx.getConnection(), httpHeader);
         final HttpTransactionContext context = HttpTransactionContext.get(ctx.getConnection());
 
-        if (httpHeader.isSkipRemainder()
-                || (context.isEstablishingTunnel()
-                    && context.getStatusHandler() == null)) {
+        if (httpHeader.isSkipRemainder()) {
             return;
         }
 
@@ -374,28 +369,18 @@ public boolean onHttpPacketParsed(HttpHeader httpHeader, FilterChainContext ctx)
 
         final HttpResponsePacket response =
                 (HttpResponsePacket) httpHeader;
-        final HttpTransactionContext context = HttpTransactionContext.get(ctx.getConnection());
-        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());
-        } else {
-            cleanup(ctx);
-            final AsyncHandler handler = context.getHandler();
-            if (handler != null) {
-                try {
-                    context.result(handler.onCompleted());
-                } catch (Exception e) {
-                    context.abort(e);
-                }
-            } else {
-                context.done();
+        final HttpTransactionContext context = HttpTransactionContext.get(
+                ctx.getConnection());
+        cleanup(ctx);
+        final AsyncHandler handler = context.getHandler();
+        if (handler != null) {
+            try {
+                context.result(handler.onCompleted());
+            } catch (Exception e) {
+                context.abort(e);
             }
+        } else {
+            context.done();
         }
         return false;
     }

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

@@ -18,7 +18,6 @@
 import org.asynchttpclient.providers.grizzly.bodyhandler.BodyHandler;
 import org.asynchttpclient.providers.grizzly.statushandler.StatusHandler;
 import org.asynchttpclient.websocket.WebSocket;
-import org.glassfish.grizzly.Connection;
 import org.glassfish.grizzly.Grizzly;
 import org.glassfish.grizzly.attributes.Attribute;
 import org.glassfish.grizzly.attributes.AttributeStorage;
@@ -58,7 +57,6 @@ public final class HttpTransactionContext {
     private HandShake handshake;
     private ProtocolHandler protocolHandler;
     private WebSocket webSocket;
-    private boolean establishingTunnel;
 
 
     // -------------------------------------------------------- Constructors
@@ -255,15 +253,6 @@ public void setWebSocket(WebSocket webSocket) {
         this.webSocket = webSocket;
     }
 
-    public boolean isEstablishingTunnel() {
-        return establishingTunnel;
-    }
-
-    public void setEstablishingTunnel(boolean establishingTunnel) {
-        this.establishingTunnel = establishingTunnel;
-    }
-
-
     // ------------------------------------------------- Package Private Methods
 
 
@@ -297,13 +286,4 @@ void result(Object result) {
         }
     }
 
-    public boolean isTunnelEstablished(final Connection c) {
-        return c.getAttributes().getAttribute("tunnel-established") != null;
-    }
-
-
-    public void tunnelEstablished(final Connection c) {
-        c.getAttributes().setAttribute("tunnel-established", Boolean.TRUE);
-    }
-
 }

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

@@ -254,7 +254,7 @@ private boolean sendAsGrizzlyRequest(final Request request,
             }
         }
 
-        if (httpCtx.isWSRequest() && !httpCtx.isEstablishingTunnel()) {
+        if (httpCtx.isWSRequest()) {
             try {
                 final URI wsURI = new URI(httpCtx.getWsRequestURI());
                 httpCtx.setProtocolHandler(Version.RFC6455.createHandler(true));

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/statushandler/ProxyAuthorizationHandler.java

@@ -173,7 +173,6 @@ public boolean handleStatus(final HttpResponsePacket responsePacket,
                 HttpTransactionContext.set(c, newContext);
 
                 newContext.setInvocationStatus(tempInvocationStatus);
-                httpTransactionContext.setEstablishingTunnel(true);
 
                 return executeRequest(httpTransactionContext, req, c);