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

Fix SocketShutdownOutputByPeerTest failure

Browse Source 
- With half-close enabled, the selector loop was spinning due to uncleared OP_READ flag.
 - Added some delay to the test for more reliable failure
This commit is contained in:
Trustin Lee 2013-02-08 01:50:44 +09:00
parent d8c0bf3be2
commit 9319e3ebd0
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketShutdownOutputByPeerTest.java
View File

@ -64,6 +64,7 @@ public class SocketShutdownOutputByPeerTest extends AbstractServerSocketTest {
assertTrue(h.ch.isInputShutdown()); assertTrue(h.ch.isInputShutdown());
assertFalse(h.ch.isOutputShutdown()); assertFalse(h.ch.isOutputShutdown());
assertEquals(1, h.closure.getCount()); assertEquals(1, h.closure.getCount());
Thread.sleep(100);
assertEquals(1, h.halfClosureCount.intValue()); assertEquals(1, h.halfClosureCount.intValue());
} finally { } finally {
s.close(); s.close();
@ -101,6 +102,7 @@ public class SocketShutdownOutputByPeerTest extends AbstractServerSocketTest {
assertTrue(h.ch.isOutputShutdown()); assertTrue(h.ch.isOutputShutdown());
assertEquals(1, h.halfClosure.getCount()); assertEquals(1, h.halfClosure.getCount());
Thread.sleep(100);
assertEquals(0, h.halfClosureCount.intValue()); assertEquals(0, h.halfClosureCount.intValue());
} finally { } finally {
s.close(); s.close();

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

@ -119,6 +119,7 @@ public abstract class AbstractNioByteChannel extends AbstractNioChannel {
setInputShutdown(); setInputShutdown();
if (isOpen()) { if (isOpen()) {
if (Boolean.TRUE.equals(config().getOption(ChannelOption.ALLOW_HALF_CLOSURE))) { if (Boolean.TRUE.equals(config().getOption(ChannelOption.ALLOW_HALF_CLOSURE))) {
key.interestOps(key.interestOps() & ~readInterestOp);
pipeline.fireUserEventTriggered(ChannelInputShutdownEvent.INSTANCE); pipeline.fireUserEventTriggered(ChannelInputShutdownEvent.INSTANCE);
} else { } else {
close(voidFuture()); close(voidFuture());