From c6d61f9b43d89dc280b6089dee674daa8c180146 Mon Sep 17 00:00:00 2001 From: Scott Mitchell Date: Mon, 18 May 2015 08:44:08 -0700 Subject: [PATCH] Fix merge issue introduced by 04c0d77 Motiviation: Interface changes between master and 4.1 branch resulted in a compile failure. Modifications: - change messageReceived to channelRead0 Result: No more compile error. --- .../io/netty/example/http2/server/Http2ServerInitializer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/src/main/java/io/netty/example/http2/server/Http2ServerInitializer.java b/example/src/main/java/io/netty/example/http2/server/Http2ServerInitializer.java index aab6f72b22..abe5edb594 100644 --- a/example/src/main/java/io/netty/example/http2/server/Http2ServerInitializer.java +++ b/example/src/main/java/io/netty/example/http2/server/Http2ServerInitializer.java @@ -70,7 +70,7 @@ public class Http2ServerInitializer extends ChannelInitializer { ch.pipeline().addLast(upgradeHandler); ch.pipeline().addLast(new SimpleChannelInboundHandler() { @Override - protected void messageReceived(ChannelHandlerContext ctx, HttpMessage msg) throws Exception { + protected void channelRead0(ChannelHandlerContext ctx, HttpMessage msg) throws Exception { // If this handler is hit then no upgrade has been attempted and the client is just talking HTTP. System.err.println("Directly talking: " + msg.protocolVersion() + " (no upgrade was attempted)"); ctx.pipeline().replace(this, "http-hello-world",