andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a bug where ChannelPIpeline.remove/replace() fails when its channel is not registered yet

Browse Source
This commit is contained in:
Trustin Lee 2013-01-14 21:49:01 +09:00
parent e263769a55
commit 573a723dc2
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
View File

@ -611,25 +611,33 @@ final class DefaultChannelPipeline implements ChannelPipeline {
}
// Free all buffers before completing removal.
ctx.executor().execute(new Runnable() {
@Override
public void run() {
if (handler instanceof ChannelInboundHandler) {
try {
((ChannelInboundHandler) handler).freeInboundBuffer(ctx);
} catch (Exception e) {
notifyHandlerException(e);
}
}
if (handler instanceof ChannelOutboundHandler) {
try {
((ChannelOutboundHandler) handler).freeOutboundBuffer(ctx);
} catch (Exception e) {
notifyHandlerException(e);
}
if (channel.isRegistered()) {
ctx.executor().execute(new Runnable() {
@Override
public void run() {
freeHandlerBuffers(handler, ctx);
}
});
} else {
freeHandlerBuffers(handler, ctx);
}
}
private void freeHandlerBuffers(ChannelHandler handler, ChannelHandlerContext ctx) {
if (handler instanceof ChannelInboundHandler) {
try {
((ChannelInboundHandler) handler).freeInboundBuffer(ctx);
} catch (Exception e) {
notifyHandlerException(e);
}
});
}
if (handler instanceof ChannelOutboundHandler) {
try {
((ChannelOutboundHandler) handler).freeOutboundBuffer(ctx);
} catch (Exception e) {
notifyHandlerException(e);
}
}
}
@Override