MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

update netty (investigate ref count exception)

Browse Source
This commit is contained in:
Vladimir Krivosheev
2013-11-15 13:39:28 +01:00
parent 4cad3d729b
commit bebe0c1020
12 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/Netty.xml
Generated
+1 -1
View File
@@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="Netty">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/netty-all-4.1.0.Alpha1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/netty-all-15.13.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
+2 -2
View File
@@ -39,7 +39,7 @@ import java.util.concurrent.ConcurrentHashMap;
class BuildMessageDispatcher extends SimpleChannelInboundHandler<CmdlineRemoteProto.Message> {
private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.server.BuildMessageDispatcher");
private static final AttributeKey<SessionData> SESSION_DATA = new AttributeKey<SessionData>("BuildMessageDispatcher.sessionData");
private static final AttributeKey<SessionData> SESSION_DATA = AttributeKey.valueOf("BuildMessageDispatcher.sessionData");
private final Map<UUID, SessionData> myMessageHandlers = new ConcurrentHashMap<UUID, SessionData>();
private final Set<UUID> myCanceledSessions = new ConcurrentHashSet<UUID>();
@@ -80,7 +80,7 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandler<CmdlineRemotePr
@Override
protected void channelRead0(ChannelHandlerContext context, CmdlineRemoteProto.Message message) throws Exception {
protected void messageReceived(ChannelHandlerContext context, CmdlineRemoteProto.Message message) throws Exception {
SessionData sessionData = context.attr(SESSION_DATA).get();
UUID sessionId;
jps/jps-builders/src/org/jetbrains/jps/client/ProtobufClientMessageHandler.java
+1 -1
View File
@@ -47,7 +47,7 @@ final class ProtobufClientMessageHandler<T extends ProtobufResponseHandler> 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<T> future = myHandlers.get(messageUUID);
final T handler = future != null ? future.getMessageHandler() : null;
jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java
+1 -1
View File
@@ -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();
jps/jps-builders/src/org/jetbrains/jps/javac/JavacServer.java
+1 -1
View File
@@ -175,7 +175,7 @@ public class JavacServer {
@ChannelHandler.Sharable
private class CompilationRequestsHandler extends SimpleChannelInboundHandler<JavacRemoteProto.Message> {
@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();
lib/netty-all-4.1.0.Alpha1.jar → lib/netty-all-15.13.jar
BIN
View File
Binary file not shown.
lib/required_for_dist.txt
+1 -1
View File
@@ -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
lib/src/netty-all-sources.jar
BIN
View File
Binary file not shown.
platform/platform-impl/src/org/jetbrains/io/DelegatingHttpRequestHandler.java
+1 -1
View File
@@ -37,7 +37,7 @@ import java.io.IOException;
@ChannelHandler.Sharable
final class DelegatingHttpRequestHandler extends DelegatingHttpRequestHandlerBase {
private static final AttributeKey<HttpRequestHandler> PREV_HANDLER = new AttributeKey<HttpRequestHandler>("DelegatingHttpRequestHandler.handler");
private static final AttributeKey<HttpRequestHandler> PREV_HANDLER = AttributeKey.valueOf("DelegatingHttpRequestHandler.handler");
@Override
protected boolean process(ChannelHandlerContext context, FullHttpRequest request, QueryStringDecoder urlDecoder) throws IOException, ImageWriteException {
platform/platform-impl/src/org/jetbrains/io/DelegatingHttpRequestHandlerBase.java
+1 -1
View File
@@ -23,7 +23,7 @@ import io.netty.handler.codec.http.QueryStringDecoder;
abstract class DelegatingHttpRequestHandlerBase extends SimpleChannelInboundHandler<FullHttpRequest> {
@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());
platform/platform-impl/src/org/jetbrains/io/PortUnificationServerHandler.java
+2 -2
View File
@@ -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();
platform/platform-tests/testSrc/com/intellij/ide/BinaryRequestHandlerTest.java
+2 -2
View File
@@ -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: {