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

Use correct timeout in AioSocketChannel.beginRead()

Browse Source
This commit is contained in:
Trustin Lee 2012-12-02 20:38:59 +09:00
parent bfe2a96505
commit 72e0acbe84
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,13 +314,19 @@ public class AioSocketChannel extends AbstractAioChannel implements SocketChanne
asyncReadInProgress = true;
if (byteBuf.hasNioBuffers()) {
ByteBuffer[] buffers = byteBuf.nioBuffers(byteBuf.writerIndex(), byteBuf.writableBytes());
javaChannel().read(buffers, 0, buffers.length, config.getWriteTimeout(),
TimeUnit.MILLISECONDS, this, SCATTERING_READ_HANDLER);
if (buffers.length == 1) {
javaChannel().read(
buffers[0], config.getReadTimeout(), TimeUnit.MILLISECONDS, this, READ_HANDLER);
} else {
javaChannel().read(
buffers, 0, buffers.length, config.getReadTimeout(), TimeUnit.MILLISECONDS,
this, SCATTERING_READ_HANDLER);
}
} else {
// Get a ByteBuffer view on the ByteBuf
ByteBuffer buffer = byteBuf.nioBuffer(byteBuf.writerIndex(), byteBuf.writableBytes());
javaChannel().read(buffer, config.getWriteTimeout(), TimeUnit.MILLISECONDS,
this, READ_HANDLER);
javaChannel().read(
buffer, config.getReadTimeout(), TimeUnit.MILLISECONDS, this, READ_HANDLER);
}
if (asyncReadInProgress) {