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

Merge pull request #556 from netty/jdk_bug_workaround

Browse Source 
Don't rely on the return value fo Selector.select(..) as it is buggy and...
This commit is contained in:
Norman Maurer 2012-08-25 11:11:05 -07:00
commit 1a6e7b4be1
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
View File

@ -242,7 +242,7 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
wakenUp.set(false); wakenUp.set(false);
try { try {
int selectedKeyCount = selector.select(10); SelectorUtil.select(selector);
// 'wakenUp.compareAndSet(false, true)' is always evaluated // 'wakenUp.compareAndSet(false, true)' is always evaluated
// before calling 'selector.wakeup()' to reduce the wake-up // before calling 'selector.wakeup()' to reduce the wake-up
@ -277,10 +277,7 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
} }
processRegisterTaskQueue(); processRegisterTaskQueue();
processSelectedKeys(selector.selectedKeys());
if (selectedKeyCount > 0) {
processSelectedKeys(selector.selectedKeys());
}
// Handle connection timeout every 10 milliseconds approximately. // Handle connection timeout every 10 milliseconds approximately.
long currentTimeNanos = System.nanoTime(); long currentTimeNanos = System.nanoTime();