diff --git a/.idea/libraries/Netty.xml b/.idea/libraries/Netty.xml index 58682b2ca369..48a94941324f 100644 --- a/.idea/libraries/Netty.xml +++ b/.idea/libraries/Netty.xml @@ -1,7 +1,7 @@ - + diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java index 135b15488165..6e5f66766e12 100644 --- a/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java +++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java @@ -39,7 +39,7 @@ import java.util.concurrent.ConcurrentHashMap; class BuildMessageDispatcher extends SimpleChannelInboundHandler { private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.server.BuildMessageDispatcher"); - private static final AttributeKey SESSION_DATA = new AttributeKey("BuildMessageDispatcher.sessionData"); + private static final AttributeKey SESSION_DATA = AttributeKey.valueOf("BuildMessageDispatcher.sessionData"); private final Map myMessageHandlers = new ConcurrentHashMap(); private final Set myCanceledSessions = new ConcurrentHashSet(); @@ -80,7 +80,7 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandler exte } @Override - public final void channelRead0(ChannelHandlerContext context, MessageLite message) throws Exception { + public final void messageReceived(ChannelHandlerContext context, MessageLite message) throws Exception { final UUID messageUUID = myUuidGetter.getSessionUUID((JavacRemoteProto.Message)message); final RequestFuture future = myHandlers.get(messageUUID); final T handler = future != null ? future.getMessageHandler() : null; diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java index c6b34ab97bed..8dc21b1b574f 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java +++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java @@ -112,7 +112,7 @@ public class BuildMain { } @Override - public void channelRead0(final ChannelHandlerContext context, CmdlineRemoteProto.Message message) throws Exception { + public void messageReceived(final ChannelHandlerContext context, CmdlineRemoteProto.Message message) throws Exception { final CmdlineRemoteProto.Message.Type type = message.getType(); final Channel channel = context.channel(); diff --git a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacServer.java b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacServer.java index b901f95bb964..72ecdaeeeef1 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacServer.java +++ b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacServer.java @@ -175,7 +175,7 @@ public class JavacServer { @ChannelHandler.Sharable private class CompilationRequestsHandler extends SimpleChannelInboundHandler { @Override - public void channelRead0(final ChannelHandlerContext context, JavacRemoteProto.Message message) throws Exception { + public void messageReceived(final ChannelHandlerContext context, JavacRemoteProto.Message message) throws Exception { final UUID sessionId = JavacProtoUtil.fromProtoUUID(message.getSessionId()); final JavacRemoteProto.Message.Type messageType = message.getMessageType(); diff --git a/lib/netty-all-4.1.0.Alpha1.jar b/lib/netty-all-15.13.jar similarity index 67% rename from lib/netty-all-4.1.0.Alpha1.jar rename to lib/netty-all-15.13.jar index 35863fda7b3e..452445ecb42e 100644 Binary files a/lib/netty-all-4.1.0.Alpha1.jar and b/lib/netty-all-15.13.jar differ diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt index 5f749bcff7f8..dee9fc0ce5db 100644 --- a/lib/required_for_dist.txt +++ b/lib/required_for_dist.txt @@ -34,7 +34,7 @@ microba.jar miglayout-swing.jar nanoxml-2.2.3.jar nekohtml-1.9.14.jar -netty-all-4.1.0.Alpha1.jar +netty-all-15.13.jar oromatcher.jar picocontainer.jar protobuf-2.5.0.jar diff --git a/lib/src/netty-all-sources.jar b/lib/src/netty-all-sources.jar index 587f0d9d7ca7..8153f818c108 100644 Binary files a/lib/src/netty-all-sources.jar and b/lib/src/netty-all-sources.jar differ diff --git a/platform/platform-impl/src/org/jetbrains/io/DelegatingHttpRequestHandler.java b/platform/platform-impl/src/org/jetbrains/io/DelegatingHttpRequestHandler.java index 305565a5b2c3..4ed354d1d72a 100644 --- a/platform/platform-impl/src/org/jetbrains/io/DelegatingHttpRequestHandler.java +++ b/platform/platform-impl/src/org/jetbrains/io/DelegatingHttpRequestHandler.java @@ -37,7 +37,7 @@ import java.io.IOException; @ChannelHandler.Sharable final class DelegatingHttpRequestHandler extends DelegatingHttpRequestHandlerBase { - private static final AttributeKey PREV_HANDLER = new AttributeKey("DelegatingHttpRequestHandler.handler"); + private static final AttributeKey PREV_HANDLER = AttributeKey.valueOf("DelegatingHttpRequestHandler.handler"); @Override protected boolean process(ChannelHandlerContext context, FullHttpRequest request, QueryStringDecoder urlDecoder) throws IOException, ImageWriteException { diff --git a/platform/platform-impl/src/org/jetbrains/io/DelegatingHttpRequestHandlerBase.java b/platform/platform-impl/src/org/jetbrains/io/DelegatingHttpRequestHandlerBase.java index 7509e60e8277..37587622a9f6 100644 --- a/platform/platform-impl/src/org/jetbrains/io/DelegatingHttpRequestHandlerBase.java +++ b/platform/platform-impl/src/org/jetbrains/io/DelegatingHttpRequestHandlerBase.java @@ -23,7 +23,7 @@ import io.netty.handler.codec.http.QueryStringDecoder; abstract class DelegatingHttpRequestHandlerBase extends SimpleChannelInboundHandler { @Override - protected void channelRead0(ChannelHandlerContext context, FullHttpRequest message) throws Exception { + protected void messageReceived(ChannelHandlerContext context, FullHttpRequest message) throws Exception { if (BuiltInServer.LOG.isDebugEnabled()) { // BuiltInServer.LOG.debug("IN HTTP:\n" + message); BuiltInServer.LOG.debug("IN HTTP: " + message.getUri()); diff --git a/platform/platform-impl/src/org/jetbrains/io/PortUnificationServerHandler.java b/platform/platform-impl/src/org/jetbrains/io/PortUnificationServerHandler.java index e70f0ca7107b..0ec8badee8d1 100644 --- a/platform/platform-impl/src/org/jetbrains/io/PortUnificationServerHandler.java +++ b/platform/platform-impl/src/org/jetbrains/io/PortUnificationServerHandler.java @@ -78,7 +78,7 @@ class PortUnificationServerHandler extends Decoder { } @Override - protected void channelRead0(ChannelHandlerContext context, ByteBuf message) throws Exception { + protected void messageReceived(ChannelHandlerContext context, ByteBuf message) throws Exception { ByteBuf buffer = getBufferIfSufficient(message, 5, context); if (buffer == null) { message.release(); @@ -162,7 +162,7 @@ class PortUnificationServerHandler extends Decoder { private static final int UUID_LENGTH = 16; @Override - protected void channelRead0(ChannelHandlerContext context, ByteBuf message) throws Exception { + protected void messageReceived(ChannelHandlerContext context, ByteBuf message) throws Exception { ByteBuf buffer = getBufferIfSufficient(message, UUID_LENGTH, context); if (buffer == null) { message.release(); diff --git a/platform/platform-tests/testSrc/com/intellij/ide/BinaryRequestHandlerTest.java b/platform/platform-tests/testSrc/com/intellij/ide/BinaryRequestHandlerTest.java index 5f2f557eea1b..082348efc359 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/BinaryRequestHandlerTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ide/BinaryRequestHandlerTest.java @@ -31,7 +31,7 @@ public class BinaryRequestHandlerTest extends LightPlatformTestCase { protected void initChannel(Channel channel) throws Exception { channel.pipeline().addLast(new Decoder() { @Override - protected void channelRead0(ChannelHandlerContext context, ByteBuf message) throws Exception { + protected void messageReceived(ChannelHandlerContext context, ByteBuf message) throws Exception { int requiredLength = 4 + text.length(); ByteBuf buffer = getBufferIfSufficient(message, requiredLength, context); if (buffer == null) { @@ -100,7 +100,7 @@ public class BinaryRequestHandlerTest extends LightPlatformTestCase { } @Override - protected void channelRead0(ChannelHandlerContext context, ByteBuf message) throws Exception { + protected void messageReceived(ChannelHandlerContext context, ByteBuf message) throws Exception { while (true) { switch (state) { case HEADER: {