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

Log on warn level if the selector was recreated and remove multiple calls to SelectionKey.cancel()

Browse Source
This commit is contained in:
Norman Maurer 2012-08-29 07:43:14 +02:00
parent dc8ff7e173
commit 49ad538aef
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioWorker.java
View File

@ -188,8 +188,6 @@ abstract class AbstractNioWorker implements Worker {
AbstractNioChannel<?> channel = (AbstractNioChannel<?>) att;
close(channel, succeededFuture(channel));
}
key.cancel();
}
try {
// time to close the old selector as everything else is registered to the new one
@ -197,7 +195,7 @@ abstract class AbstractNioWorker implements Worker {
} catch (Throwable t) {
logger.warn("Failed to close a selector.", t);
}
logger.debug("Recreated Selector because of possible jdk epoll(..) bug");
logger.warn("Recreated Selector because of possible jdk epoll(..) bug");
return newSelector;
}
@ -271,7 +269,7 @@ abstract class AbstractNioWorker implements Worker {
// returned before the minSelectTimeout elapsed with nothing select.
// this may be the cause of the jdk epoll(..) bug, so increment the counter
// which we use later to see if its really the jdk bug.
selectReturnsImmediately++;
selectReturnsImmediately ++;
} else {
selectReturnsImmediately = 0;
}

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

@ -257,7 +257,7 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
// returned before the minSelectTimeout elapsed with nothing select.
// this may be the cause of the jdk epoll(..) bug, so increment the counter
// which we use later to see if its really the jdk bug.
selectReturnsImmediately++;
selectReturnsImmediately ++;
} else {
selectReturnsImmediately = 0;
}
@ -471,7 +471,6 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
// close the Channel if we can't register it
close(key);
}
key.cancel();
}
try {
@ -480,7 +479,7 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
} catch (Throwable t) {
logger.warn("Failed to close a selector.", t);
}
logger.debug("Recreated Selector because of possible jdk epoll(..) bug");
logger.warn("Recreated Selector because of possible jdk epoll(..) bug");
return newSelector;
}