From 949bfdf8c532e23c0925f08e4c0d9662857c0e3c Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Wed, 30 Mar 2016 10:23:32 +0200 Subject: [PATCH] [#5045] Fix websockets server example which was broken by 2e6544f Motivation: While backport the change from 4.1 to 4.0 I somehow missed to port one line and so broke the example. Modifications: Add needed handler which was missing due bad merge commit. Result: Example works again in 4.0 --- .../http/websocketx/server/WebSocketServerInitializer.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerInitializer.java b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerInitializer.java index a4ca9131a7..8999af241d 100644 --- a/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerInitializer.java +++ b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerInitializer.java @@ -20,6 +20,7 @@ import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpServerCodec; +import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler; import io.netty.handler.ssl.SslContext; /** @@ -42,6 +43,7 @@ public class WebSocketServerInitializer extends ChannelInitializer