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

No need to clear buffer as it is cleared later anyway and only update interestedOps if needed

Browse Source
This commit is contained in:
Norman Maurer 2013-05-24 12:50:04 +02:00
parent d31ccebd62
commit f5dc482a59
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
transport/src/main/java/io/netty/channel/nio/AbstractNioByteChannel.java
View File

@ -55,8 +55,11 @@ public abstract class AbstractNioByteChannel extends AbstractNioChannel {
assert eventLoop().inEventLoop();
final SelectionKey key = selectionKey();
if (!config().isAutoRead()) {
// only remove readInterestOp if needed
key.interestOps(key.interestOps() & ~readInterestOp);
int interestOps = key.interestOps();
if ((interestOps & readInterestOp) != 0) {
// only remove readInterestOp if needed
key.interestOps(interestOps & ~readInterestOp);
}
}
final ChannelPipeline pipeline = pipeline();
@ -139,12 +142,7 @@ public abstract class AbstractNioByteChannel extends AbstractNioChannel {
protected void doFlushByteBuffer(ByteBuf buf) throws Exception {
for (int i = config().getWriteSpinCount() - 1; i >= 0; i --) {
int localFlushedAmount = doWriteBytes(buf, i == 0);
if (localFlushedAmount > 0) {
break;
}
if (!buf.isReadable()) {
// Reset reader/writerIndex to 0 if the buffer is empty.
buf.clear();
if (localFlushedAmount > 0 || !buf.isReadable()) {
break;
}
}