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

Make sure all pending writes are flushed. See #396

Browse Source
This commit is contained in:
Norman Maurer 2012-07-01 22:20:36 +02:00
parent 8c0146fbd8
commit 0562aad91f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,6 +123,7 @@ public class AioSocketChannel extends AbstractAioChannel implements SocketChanne
expandReadBuffer(byteBuf);
// Get a ByteBuffer view on the ByteBuf
ByteBuffer buffer = byteBuf.nioBuffer(byteBuf.writerIndex(), byteBuf.writableBytes());
javaChannel().read(buffer, this, READ_HANDLER);
}
@ -169,7 +170,6 @@ public class AioSocketChannel extends AbstractAioChannel implements SocketChanne
// into this
if (flushing.compareAndSet(false, true)) {
ByteBuffer buffer = buf.nioBuffer();
System.err.println("WRITE: " + buffer);
javaChannel().write(buffer, this, WRITE_HANDLER);
}
return false;
@ -194,6 +194,13 @@ public class AioSocketChannel extends AbstractAioChannel implements SocketChanne
// Allow to have the next write pending
channel.flushing.set(false);
try {
// try to flush it again if nothing is left it will return fast here
channel.doFlushByteBuffer(buf);
} catch (Exception e) {
// Should never happen, anyway call failed just in case
failed(e, channel);
}
}
@Override