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

Fix a bug in AioSocketChannel where inboundBufferSuspended() is triggered even if the channel is closed.

Browse Source
This commit is contained in:
Trustin Lee 2013-01-01 00:26:52 +09:00
parent 8cf9f52919
commit 93fd73fbbf
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
transport/src/main/java/io/netty/channel/socket/aio/AioSocketChannel.java
View File

@ -325,6 +325,10 @@ public class AioSocketChannel extends AbstractAioChannel implements SocketChanne
inDoBeginRead = true; inDoBeginRead = true;
try { try {
for (;;) { for (;;) {
if (inputShutdown) {
break;
}
ByteBuf byteBuf = pipeline().inboundByteBuffer(); ByteBuf byteBuf = pipeline().inboundByteBuffer();
if (!byteBuf.readable()) { if (!byteBuf.readable()) {
byteBuf.discardReadBytes(); byteBuf.discardReadBytes();
@ -468,16 +472,16 @@ public class AioSocketChannel extends AbstractAioChannel implements SocketChanne
pipeline.fireInboundBufferUpdated(); pipeline.fireInboundBufferUpdated();
} }
firedInboundBufferSuspended = true; if (!closed && channel.isOpen()) {
pipeline.fireInboundBufferSuspended(); firedInboundBufferSuspended = true;
pipeline.fireInboundBufferSuspended();
}
pipeline.fireExceptionCaught(t); pipeline.fireExceptionCaught(t);
} finally { } finally {
if (read) { if (read) {
pipeline.fireInboundBufferUpdated(); pipeline.fireInboundBufferUpdated();
} }
if (!firedInboundBufferSuspended) {
pipeline.fireInboundBufferSuspended();
}
// Double check because fireInboundBufferUpdated() might have triggered the closure by a user handler. // Double check because fireInboundBufferUpdated() might have triggered the closure by a user handler.
if (closed || !channel.isOpen()) { if (closed || !channel.isOpen()) {
@ -489,6 +493,8 @@ public class AioSocketChannel extends AbstractAioChannel implements SocketChanne
channel.unsafe().close(channel.unsafe().voidFuture()); channel.unsafe().close(channel.unsafe().voidFuture());
} }
} }
} else if (!firedInboundBufferSuspended) {
pipeline.fireInboundBufferSuspended();
} }
} }
} }