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

Now that LocalChannel#releaseInboundBuffers is only called from the EventLoop (eb4d317b9d) it should clear readInProgress and drain/release the queue. Otherwise if a read event is pending (doBeginRead) was called we may later call channelRead or channelReadComplete after we have closed the channel.

Browse Source 
Modifications:
LocalChannel#releaseInboundBuffers should always clear/release the queue and set readInProgress to false

Result:
LocalChannel queue is more reliably cleaned up.
This commit is contained in:
Scott Mitchell 2016-11-21 10:46:21 -08:00
parent eb4d317b9d
commit a25101dd0b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
transport/src/main/java/io/netty/channel/local/LocalChannel.java
View File

@ -422,9 +422,8 @@ public class LocalChannel extends AbstractChannel {
} }
private void releaseInboundBuffers() { private void releaseInboundBuffers() {
if (readInProgress) { assert eventLoop() == null || eventLoop().inEventLoop();
return; readInProgress = false;
}
Queue<Object> inboundBuffer = this.inboundBuffer; Queue<Object> inboundBuffer = this.inboundBuffer;
Object msg; Object msg;
while ((msg = inboundBuffer.poll()) != null) { while ((msg = inboundBuffer.poll()) != null) {