From ec5ad7b22c866fea7f15d97f59ff13f1825120bf Mon Sep 17 00:00:00 2001
From: Norman Maurer <nmaurer@redhat.com>
Date: Thu, 10 Jan 2013 12:40:27 +0100
Subject: [PATCH] [#921] Fix NPE which can be thrown on bad-timing when using
 WebSocketClientHandshaker07

---
 .../codec/http/websocketx/WebSocketClientHandshaker07.java       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker07.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker07.java
index 2cf9ef0f48..ed4a13344e 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker07.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker07.java
@@ -223,7 +223,6 @@ public class WebSocketClientHandshaker07 extends WebSocketClientHandshaker {
         setHandshakeComplete();
 
         ChannelPipeline p = channel.pipeline();
-        p.remove(HttpRequestEncoder.class);
         p.get(HttpResponseDecoder.class).replace(
                 "ws-decoder",
                 new WebSocket07FrameDecoder(false, allowExtensions, getMaxFramePayloadLength()));