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

Make sure channelInactive() and channelDeregistered() are triggered even if outboundBuffer.recycle() fails

Browse Source
This commit is contained in:
Trustin Lee 2013-07-19 01:09:19 +09:00
parent 7215c011ca
commit fef838f197
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
transport/src/main/java/io/netty/channel/AbstractChannel.java
View File

@ -523,22 +523,25 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
} }
// fail all queued messages // fail all queued messages
ChannelOutboundBuffer outboundBuffer = this.outboundBuffer; try {
outboundBuffer.failFlushed(CLOSED_CHANNEL_EXCEPTION); ChannelOutboundBuffer outboundBuffer = this.outboundBuffer;
outboundBuffer.failUnflushed(CLOSED_CHANNEL_EXCEPTION); outboundBuffer.failFlushed(CLOSED_CHANNEL_EXCEPTION);
outboundBuffer.recycle(); outboundBuffer.failUnflushed(CLOSED_CHANNEL_EXCEPTION);
this.outboundBuffer = null; outboundBuffer.recycle();
} finally {
outboundBuffer = null;
if (wasActive && !isActive()) { if (wasActive && !isActive()) {
invokeLater(new Runnable() { invokeLater(new Runnable() {
@Override @Override
public void run() { public void run() {
pipeline.fireChannelInactive(); pipeline.fireChannelInactive();
} }
}); });
}
deregister(voidPromise());
} }
deregister(voidPromise());
} else { } else {
// Closed already. // Closed already.
promise.setSuccess(); promise.setSuccess();