From d765f6b870fda68ccea79c1903f17f2127158e8c Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Fri, 25 Apr 2014 14:00:04 +0900 Subject: [PATCH] Synchronized between 4.1 and master (part 3) Motivation: 4 and 5 were diverged long time ago and we recently reverted some of the early commits in master. We must make sure 4.1 and master are not very different now. Modification: Fix found differences Result: 4.1 and master got closer. --- .../io/netty/handler/codec/http/HttpContentCompressor.java | 2 +- .../websocketx/WebSocketServerProtocolHandshakeHandler.java | 3 +-- .../codec/memcache/binary/BinaryMemcacheClientCodec.java | 1 - .../main/java/io/netty/handler/logging/LoggingHandler.java | 6 +++--- .../java/io/netty/handler/stream/ChunkedWriteHandler.java | 3 +-- .../java/io/netty/channel/embedded/EmbeddedEventLoop.java | 1 + 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java index 5fcef790d0..e300881693 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java @@ -96,7 +96,7 @@ public class HttpContentCompressor extends HttpContentEncoder { protected Result beginEncode(HttpResponse headers, String acceptEncoding) throws Exception { String contentEncoding = headers.headers().get(HttpHeaders.Names.CONTENT_ENCODING); if (contentEncoding != null && - !HttpHeaders.Values.IDENTITY.equalsIgnoreCase(contentEncoding)) { + !HttpHeaders.equalsIgnoreCase(HttpHeaders.Values.IDENTITY, contentEncoding)) { return null; } 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 a1f0d3e207..0aaee7af38 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 @@ -35,8 +35,7 @@ import static io.netty.handler.codec.http.HttpVersion.*; /** * Handles the HTTP handshake (the HTTP Upgrade request) for {@link WebSocketServerProtocolHandler}. */ -class WebSocketServerProtocolHandshakeHandler - extends ChannelInboundHandlerAdapter { +class WebSocketServerProtocolHandshakeHandler extends ChannelInboundHandlerAdapter { private final String websocketPath; private final String subprotocols; diff --git a/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheClientCodec.java b/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheClientCodec.java index 562f236a21..b7b67eb9fe 100644 --- a/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheClientCodec.java +++ b/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheClientCodec.java @@ -116,5 +116,4 @@ public final class BinaryMemcacheClientCodec extends ChannelHandlerAppender { } } } - } diff --git a/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java b/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java index 35005d60e4..b84243bf84 100644 --- a/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java +++ b/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java @@ -35,7 +35,7 @@ import java.net.SocketAddress; * By default, all events are logged at DEBUG level. */ @Sharable -@SuppressWarnings("StringConcatenationInsideStringBufferAppend") +@SuppressWarnings({ "StringConcatenationInsideStringBufferAppend", "StringBufferReplaceableByString" }) public class LoggingHandler extends ChannelDuplexHandler { private static final LogLevel DEFAULT_LEVEL = LogLevel.DEBUG; @@ -202,7 +202,7 @@ public class LoggingHandler extends ChannelDuplexHandler { if (logger.isEnabled(internalLevel)) { logger.log(internalLevel, format(ctx, "UNREGISTERED")); } - super.channelUnregistered(ctx); + ctx.fireChannelUnregistered(); } @Override @@ -276,7 +276,7 @@ public class LoggingHandler extends ChannelDuplexHandler { if (logger.isEnabled(internalLevel)) { logger.log(internalLevel, format(ctx, "DEREGISTER")); } - super.deregister(ctx, promise); + ctx.deregister(promise); } @Override diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java index 72442ac1be..9f8ba6b176 100644 --- a/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java +++ b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java @@ -66,8 +66,7 @@ import java.util.Queue; * transfer. To resume the transfer when a new chunk is available, you have to * call {@link #resumeTransfer()}. */ -public class ChunkedWriteHandler - extends ChannelDuplexHandler { +public class ChunkedWriteHandler extends ChannelDuplexHandler { private static final InternalLogger logger = InternalLoggerFactory.getInstance(ChunkedWriteHandler.class); diff --git a/transport/src/main/java/io/netty/channel/embedded/EmbeddedEventLoop.java b/transport/src/main/java/io/netty/channel/embedded/EmbeddedEventLoop.java index db8d3a0f04..21bb2c30ab 100644 --- a/transport/src/main/java/io/netty/channel/embedded/EmbeddedEventLoop.java +++ b/transport/src/main/java/io/netty/channel/embedded/EmbeddedEventLoop.java @@ -121,6 +121,7 @@ final class EmbeddedEventLoop extends AbstractEventLoop implements ChannelHandle public EventExecutor executor() { return this; } + @Override public void invokeChannelRegistered(ChannelHandlerContext ctx) { invokeChannelRegisteredNow(ctx);