Add pinned channel entry

Author: slandelle

client/src/main/java/org/asynchttpclient/netty/channel/ChannelManager.java

@@ -69,6 +69,7 @@
 public class ChannelManager {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ChannelManager.class);
+    public static final String PINNED_ENTRY = "entry";
     public static final String HTTP_CLIENT_CODEC = "http";
     public static final String SSL_HANDLER = "ssl";
     public static final String DEFLATER_HANDLER = "deflater";
@@ -232,7 +233,7 @@ private Class<? extends Channel> getEpollSocketChannelClass() {
             throw new IllegalArgumentException(e);
         }
     }
-    
+
     public void configureBootstraps(NettyRequestSender requestSender) {
 
         HttpProtocol httpProtocol = new HttpProtocol(this, config, requestSender);
@@ -241,10 +242,13 @@ public void configureBootstraps(NettyRequestSender requestSender) {
         WebSocketProtocol wsProtocol = new WebSocketProtocol(this, config, requestSender);
         wsHandler = new AsyncHttpClientHandler(config, this, requestSender, wsProtocol);
 
+        final NoopHandler pinnedEntry = new NoopHandler();
+
         httpBootstrap.handler(new ChannelInitializer<Channel>() {
             @Override
             protected void initChannel(Channel ch) throws Exception {
                 ch.pipeline()//
+                        .addLast(PINNED_ENTRY, pinnedEntry)//
                         .addLast(HTTP_CLIENT_CODEC, newHttpClientCodec())//
                         .addLast(INFLATER_HANDLER, newHttpContentDecompressor())//
                         .addLast(CHUNKED_WRITER_HANDLER, new ChunkedWriteHandler())//
@@ -261,6 +265,7 @@ protected void initChannel(Channel ch) throws Exception {
             @Override
             protected void initChannel(Channel ch) throws Exception {
                 ch.pipeline()//
+                        .addLast(PINNED_ENTRY, pinnedEntry)//
                         .addLast(HTTP_CLIENT_CODEC, newHttpClientCodec())//
                         .addLast(AHC_WS_HANDLER, wsHandler);
 
@@ -411,12 +416,12 @@ public void upgradeProtocol(ChannelPipeline pipeline, Uri requestUri) throws SSL
             if (isSslHandlerConfigured(pipeline)) {
                 pipeline.addAfter(SSL_HANDLER, HTTP_CLIENT_CODEC, newHttpClientCodec());
             } else {
-                pipeline.addFirst(HTTP_CLIENT_CODEC, newHttpClientCodec());
-                pipeline.addFirst(SSL_HANDLER, createSslHandler(requestUri.getHost(), requestUri.getExplicitPort()));
+                pipeline.addAfter(PINNED_ENTRY, HTTP_CLIENT_CODEC, newHttpClientCodec());
+                pipeline.addAfter(PINNED_ENTRY, SSL_HANDLER, createSslHandler(requestUri.getHost(), requestUri.getExplicitPort()));
             }
 
         else
-            pipeline.addFirst(HTTP_CLIENT_CODEC, newHttpClientCodec());
+            pipeline.addAfter(PINNED_ENTRY, HTTP_CLIENT_CODEC, newHttpClientCodec());
 
         if (requestUri.isWebSocket()) {
             pipeline.addAfter(AHC_HTTP_HANDLER, AHC_WS_HANDLER, wsHandler);

client/src/main/java/org/asynchttpclient/netty/channel/NoopHandler.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2015 AsyncHttpClient Project. All rights reserved.
+ *
+ * This program is licensed to you under the Apache License Version 2.0,
+ * and you may not use this file except in compliance with the Apache License Version 2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at
+ *     http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the Apache License Version 2.0 is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
+ */
+package org.asynchttpclient.netty.channel;
+
+import io.netty.channel.ChannelHandlerAdapter;
+import io.netty.channel.ChannelHandler.Sharable;
+
+/**
+ * A noop handler that just serves as a pinned reference for adding and removing handlers in the pipeline
+ */
+@Sharable
+public class NoopHandler extends ChannelHandlerAdapter {
+}