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

Fixed issue: NETTY-214 NIO socket / datagram transport sometimes does not shut down

Browse Source 
* Fixed a race condition in NioWorker.close() and NioDatagramWorker.close()
This commit is contained in:
Trustin Lee 2009-08-27 04:23:44 +00:00
parent be32586d50
commit 1574fc3188
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java
View File

@ -648,15 +648,18 @@ class NioDatagramWorker implements Runnable {
final ChannelFuture future) {
NioDatagramWorker worker = channel.worker;
Selector selector = worker.selector;
SelectionKey key = channel.getDatagramChannel().keyFor(selector);
if (key != null) {
key.cancel();
}
boolean connected = channel.isConnected();
boolean bound = channel.isBound();
try {
channel.getDatagramChannel().close();
synchronized (channel.interestOpsLock) {
SelectionKey key = channel.getDatagramChannel().keyFor(selector);
if (key != null) {
key.cancel();
}
channel.getDatagramChannel().close();
}
if (channel.setClosed()) {
future.setSuccess();
if (connected) {

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

@ -562,15 +562,18 @@ class NioWorker implements Runnable {
static void close(NioSocketChannel channel, ChannelFuture future) {
NioWorker worker = channel.worker;
Selector selector = worker.selector;
SelectionKey key = channel.socket.keyFor(selector);
if (key != null) {
key.cancel();
}
boolean connected = channel.isConnected();
boolean bound = channel.isBound();
try {
channel.socket.close();
synchronized (channel.interestOpsLock) {
SelectionKey key = channel.socket.keyFor(selector);
if (key != null) {
key.cancel();
}
channel.socket.close();
}
if (channel.setClosed()) {
future.setSuccess();
if (connected) {