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

Fixed test failure

Browse Source
This commit is contained in:
Trustin Lee 2008-11-27 16:22:20 +00:00
parent 044fd23b0b
commit 18ac6f925f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -382,6 +382,12 @@ class NioWorker implements Runnable {
if (worker != null) {
Thread workerThread = worker.thread;
if (workerThread != null && Thread.currentThread() != workerThread) {
if (!channel.isWritable()) {
// Will be written by the worker thread
// when the channel is ready to write.
return;
}
if (channel.writeTaskInTaskQueue.compareAndSet(false, true)) {
worker.writeTaskQueue.offer(channel.writeTask);
}
@ -716,8 +722,8 @@ class NioWorker implements Runnable {
boolean bound = channel.isBound();
try {
channel.socket.close();
assert future == channel.getCloseFuture();
if (channel.setClosed()) {
future.setSuccess();
if (connected) {
if (channel.getInterestOps() != Channel.OP_WRITE) {
channel.setInterestOpsNow(Channel.OP_WRITE);
@ -731,6 +737,8 @@ class NioWorker implements Runnable {
cleanUpWriteBuffer(channel);
fireChannelClosed(channel);
} else {
future.setSuccess();
}
} catch (Throwable t) {
future.setFailure(t);