Make sure setHandshakeComplete() is called before the handler is repl…

…aced. See #332
netty · May 18, 2012 · 17cdc98 · 17cdc98
1 parent 288ed13
commit 17cdc98
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java
@@ -240,11 +240,11 @@ public void finishHandshake(Channel channel, HttpResponse response) throws WebSo
         String subprotocol = response.getHeader(Names.SEC_WEBSOCKET_PROTOCOL);
         setActualSubprotocol(subprotocol);
 
+        setHandshakeComplete();
 
         channel.getPipeline().get(HttpResponseDecoder.class).replace("ws-decoder",
                 new WebSocket00FrameDecoder(getMaxFramePayloadLength()));
 
-        setHandshakeComplete();
 
     }
 

diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java
@@ -229,10 +229,11 @@ public void finishHandshake(Channel channel, HttpResponse response) {
         setActualSubprotocol(subprotocol);
 
 
+        setHandshakeComplete();
+
         channel.getPipeline().get(HttpResponseDecoder.class).replace("ws-decoder",
                 new WebSocket08FrameDecoder(false, allowExtensions, this.getMaxFramePayloadLength()));
 
-        setHandshakeComplete();
 
     }
 }
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java
@@ -224,11 +224,11 @@ public void finishHandshake(Channel channel, HttpResponse response) throws WebSo
         String subprotocol = response.getHeader(Names.SEC_WEBSOCKET_PROTOCOL);
         setActualSubprotocol(subprotocol);
 
-
+        setHandshakeComplete();
+
         channel.getPipeline().get(HttpResponseDecoder.class).replace("ws-decoder",
                 new WebSocket13FrameDecoder(false, allowExtensions, this.getMaxFramePayloadLength()));
 
-        setHandshakeComplete();
 
     }
 }