From 978cf0d98a5c53e0bfbadfe666674fbc90adb429 Mon Sep 17 00:00:00 2001
From: Norman Maurer <nmaurer@redhat.com>
Date: Mon, 11 Mar 2013 13:54:03 +0100
Subject: [PATCH] Fix a NoSuchElementException when WebSocketClientHandshaker
 is used with HttpRequestEncoder

---
 .../codec/http/websocketx/WebSocketClientHandshaker.java    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java
index 4b2c2fd5b6..471517c5ba 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java
@@ -212,12 +212,8 @@ public abstract class WebSocketClientHandshaker {
                 throw new IllegalStateException("ChannelPipeline does not contain " +
                         "a HttpRequestEncoder or HttpClientCodec");
             }
-            p.replaceAndForward(ctx.name(), "ws-decoder", newWebsocketDecoder());
-        } else {
-            p.remove(HttpRequestEncoder.class);
-            p.replaceAndForward(ctx.name(),
-                    "ws-decoder", newWebsocketDecoder());
         }
+        p.replaceAndForward(ctx.name(), "ws-decoder", newWebsocketDecoder());
     }
 
     /**