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

Do not attempt to flush when waiting for OP_WRITE

Browse Source
This commit is contained in:
Trustin Lee 2012-05-11 21:26:54 +09:00
parent 4b673c4ebb
commit 1db0cd60c4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java
View File

@ -161,10 +161,15 @@ public class NioSocketChannel extends AbstractNioChannel implements io.netty.cha
@Override
protected int doFlush() throws Exception {
final SelectionKey key = selectionKey();
final int interestOps = key.interestOps();
if ((interestOps & SelectionKey.OP_WRITE) != 0) {
return 0;
}
boolean open = true;
boolean addOpWrite = false;
boolean removeOpWrite = false;
final SocketChannel ch = javaChannel();
final int writeSpinCount = config().getWriteSpinCount();
final ChannelBuffer buf = unsafe().out().byteBuffer();
@ -204,11 +209,9 @@ public class NioSocketChannel extends AbstractNioChannel implements io.netty.cha
if (open) {
if (addOpWrite) {
SelectionKey key = selectionKey();
key.interestOps(key.interestOps() | SelectionKey.OP_WRITE);
key.interestOps(interestOps | SelectionKey.OP_WRITE);
} else if (removeOpWrite) {
SelectionKey key = selectionKey();
key.interestOps(key.interestOps() & ~SelectionKey.OP_WRITE);
key.interestOps(interestOps & ~SelectionKey.OP_WRITE);
}
}