From 2dde3a386bd3652a92c0c862b6588878bd94fe16 Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Wed, 9 Sep 2015 14:25:32 +0200
Subject: [PATCH] [#3687] Correctly store WebSocketServerHandshaker in Channel
 attributes

Motivation:

As we stored the WebSocketServerHandshaker in the ChannelHandlerContext it was always null and so no close frame was send if WebSocketServerProtocolHandler was used.

Modifications:

Store WebSocketServerHAndshaker in the Channel attributes and so make it visibile between different handlers.

Result:

Correctly send close frame.
---
 .../websocketx/WebSocketServerProtocolHandler.java    | 11 ++++++-----
 .../WebSocketServerProtocolHandshakeHandler.java      |  2 +-
 .../WebSocketServerProtocolHandlerTest.java           |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandler.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandler.java
index 15f1b0fbd8..aacac1cabc 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandler.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandler.java
@@ -16,6 +16,7 @@
 package io.netty.handler.codec.http.websocketx;
 
 import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
@@ -109,7 +110,7 @@ public class WebSocketServerProtocolHandler extends WebSocketProtocolHandler {
     @Override
     protected void decode(ChannelHandlerContext ctx, WebSocketFrame frame, List<Object> out) throws Exception {
         if (frame instanceof CloseWebSocketFrame) {
-            WebSocketServerHandshaker handshaker = getHandshaker(ctx);
+            WebSocketServerHandshaker handshaker = getHandshaker(ctx.channel());
             if (handshaker != null) {
                 frame.retain();
                 handshaker.close(ctx.channel(), (CloseWebSocketFrame) frame);
@@ -132,12 +133,12 @@ public class WebSocketServerProtocolHandler extends WebSocketProtocolHandler {
         }
     }
 
-    static WebSocketServerHandshaker getHandshaker(ChannelHandlerContext ctx) {
-        return ctx.attr(HANDSHAKER_ATTR_KEY).get();
+    static WebSocketServerHandshaker getHandshaker(Channel channel) {
+        return channel.attr(HANDSHAKER_ATTR_KEY).get();
     }
 
-    static void setHandshaker(ChannelHandlerContext ctx, WebSocketServerHandshaker handshaker) {
-        ctx.attr(HANDSHAKER_ATTR_KEY).set(handshaker);
+    static void setHandshaker(Channel channel, WebSocketServerHandshaker handshaker) {
+        channel.attr(HANDSHAKER_ATTR_KEY).set(handshaker);
     }
 
     static ChannelHandler forbiddenHttpRequestResponder() {
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandshakeHandler.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandshakeHandler.java
index 7839030766..c3fa9a5252 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandshakeHandler.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandshakeHandler.java
@@ -80,7 +80,7 @@ class WebSocketServerProtocolHandshakeHandler extends ChannelInboundHandlerAdapt
                         }
                     }
                 });
-                WebSocketServerProtocolHandler.setHandshaker(ctx, handshaker);
+                WebSocketServerProtocolHandler.setHandshaker(ctx.channel(), handshaker);
                 ctx.pipeline().replace(this, "WS403Responder",
                         WebSocketServerProtocolHandler.forbiddenHttpRequestResponder());
             }
diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandlerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandlerTest.java
index 3da5720cde..f859c25366 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandlerTest.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandlerTest.java
@@ -55,7 +55,7 @@ public class WebSocketServerProtocolHandlerTest {
         ChannelHandlerContext handshakerCtx = ch.pipeline().context(WebSocketServerProtocolHandshakeHandler.class);
         writeUpgradeRequest(ch);
         assertEquals(SWITCHING_PROTOCOLS, ReferenceCountUtil.releaseLater(responses.remove()).status());
-        assertNotNull(WebSocketServerProtocolHandler.getHandshaker(handshakerCtx));
+        assertNotNull(WebSocketServerProtocolHandler.getHandshaker(handshakerCtx.channel()));
     }
 
     @Test