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

4
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; AbstractNioChannel<?> channel = (AbstractNioChannel<?>) att;
close(channel, succeededFuture(channel)); close(channel, succeededFuture(channel));
} }
key.cancel();
} }
try { try {
// time to close the old selector as everything else is registered to the new one // 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) { } catch (Throwable t) {
logger.warn("Failed to close a selector.", 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; return newSelector;
} }

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

@ -471,7 +471,6 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
// close the Channel if we can't register it // close the Channel if we can't register it
close(key); close(key);
} }
key.cancel();
} }
try { try {
@ -480,7 +479,7 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
} catch (Throwable t) { } catch (Throwable t) {
logger.warn("Failed to close a selector.", 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; return newSelector;
} }