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

The thread that calls NioWorker.close() might not be in the selector loop

Browse Source
This commit is contained in:
Trustin Lee 2009-10-27 06:20:45 +00:00
parent ff6cf1787e
commit 7f05275305
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
View File

@ -22,7 +22,6 @@ import java.net.SocketAddress;
import java.nio.channels.AsynchronousCloseException; import java.nio.channels.AsynchronousCloseException;
import java.nio.channels.CancelledKeyException; import java.nio.channels.CancelledKeyException;
import java.nio.channels.ClosedChannelException; import java.nio.channels.ClosedChannelException;
import java.nio.channels.ClosedSelectorException;
import java.nio.channels.NotYetConnectedException; import java.nio.channels.NotYetConnectedException;
import java.nio.channels.ScatteringByteChannel; import java.nio.channels.ScatteringByteChannel;
import java.nio.channels.SelectionKey; import java.nio.channels.SelectionKey;
@ -587,13 +586,15 @@ class NioWorker implements Runnable {
// Otherwise the process will experience sudden spike // Otherwise the process will experience sudden spike
// in the number of open files, with high chance of getting // in the number of open files, with high chance of getting
// the 'too many open files' error. // the 'too many open files' error.
try { if (Thread.currentThread() == worker.thread) {
selector.selectNow(); selector.selectNow();
if (worker.wakenUp.get()) { if (worker.wakenUp.get()) {
selector.wakeup(); selector.wakeup();
} }
} catch (ClosedSelectorException e) { } else {
// Can happen - ignore. if (worker.wakenUp.compareAndSet(false, true)) {
selector.wakeup();
}
} }
} }
} }