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

NETTY-410 NioWorker write deadlock

Browse Source 
Applied the patch provided by Greg Dhuse.
This commit is contained in:
Trustin Lee 2011-08-01 01:32:55 +09:00
parent 8982838ab2
commit 2acd74db83
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -506,10 +506,13 @@ class NioWorker implements Runnable {
}
}
channel.inWriteNowLoop = false;
}
fireWriteComplete(channel, writtenBytes);
// Initially, the following block was executed after releasing
// the writeLock, but there was a race condition, and it has to be
// executed before releasing the writeLock:
//
// https://issues.jboss.org/browse/NETTY-410
//
if (open) {
if (addOpWrite) {
setOpWrite(channel);
@ -519,6 +522,9 @@ class NioWorker implements Runnable {
}
}
fireWriteComplete(channel, writtenBytes);
}
private void setOpWrite(NioSocketChannel channel) {
Selector selector = this.selector;
SelectionKey key = channel.socket.keyFor(selector);