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

Fix a bug where the buffers are freed too early when a handler is removed or replaced

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

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

@ -598,23 +598,8 @@ final class DefaultChannelPipeline implements ChannelPipeline {
} }
} }
private void callAfterRemove(ChannelHandlerContext ctx) { private void callAfterRemove(final ChannelHandlerContext ctx) {
// Free all buffers before completing removal. final ChannelHandler handler = ctx.handler();
ChannelHandler handler = ctx.handler();
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);
}
}
// Notify the complete removal. // Notify the complete removal.
try { try {
@ -624,6 +609,27 @@ final class DefaultChannelPipeline implements ChannelPipeline {
ctx.handler().getClass().getName() + ctx.handler().getClass().getName() +
".afterRemove() has thrown an exception.", t); ".afterRemove() has thrown an exception.", t);
} }
// 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);
}
}
}
});
} }
@Override @Override