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

Fixes the problem where the promise of the outbound operation that causes a channel closure is notified after channelInactive()

Browse Source 
- Fixes #1897
This commit is contained in:
Trustin Lee 2013-10-08 12:24:16 +09:00
parent e307979a0d
commit d7f9b1ee76
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
transport/src/main/java/io/netty/channel/AbstractChannel.java
View File

@ -477,8 +477,8 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
try {
doBind(localAddress);
} catch (Throwable t) {
closeIfClosed();
promise.setFailure(t);
closeIfClosed();
return;
}
if (!wasActive && isActive()) {
@ -498,8 +498,8 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
try {
doDisconnect();
} catch (Throwable t) {
closeIfClosed();
promise.setFailure(t);
closeIfClosed();
return;
}
if (wasActive && !isActive()) {
@ -510,8 +510,8 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
}
});
}
closeIfClosed(); // doDisconnect() might have closed the channel
promise.setSuccess();
closeIfClosed(); // doDisconnect() might have closed the channel
}
@Override

6
transport/src/main/java/io/netty/channel/local/LocalChannel.java
View File

@ -35,6 +35,7 @@ import java.nio.channels.ClosedChannelException;
import java.nio.channels.ConnectionPendingException;
import java.nio.channels.NotYetConnectedException;
import java.util.ArrayDeque;
import java.util.Collections;
import java.util.Queue;
/**
@ -293,9 +294,7 @@ public class LocalChannel extends AbstractChannel {
peerLoop.execute(new Runnable() {
@Override
public void run() {
for (int i = 0; i < msgsCopy.length; i++) {
peer.inboundBuffer.add(msgsCopy[i]);
}
Collections.addAll(peer.inboundBuffer, msgsCopy);
finishPeerRead(peer, peerPipeline);
}
});
@ -350,7 +349,6 @@ public class LocalChannel extends AbstractChannel {
doBind(localAddress);
} catch (Throwable t) {
promise.setFailure(t);
pipeline().fireExceptionCaught(t);
close(voidPromise());
return;
}

2
transport/src/main/java/io/netty/channel/nio/AbstractNioChannel.java
View File

@ -210,8 +210,8 @@ public abstract class AbstractNioChannel extends AbstractChannel {
newT.setStackTrace(t.getStackTrace());
t = newT;
}
closeIfClosed();
promise.tryFailure(t);
closeIfClosed();
}
}

2
transport/src/main/java/io/netty/channel/oio/AbstractOioChannel.java
View File

@ -80,8 +80,8 @@ public abstract class AbstractOioChannel extends AbstractChannel {
newT.setStackTrace(t.getStackTrace());
t = newT;
}
closeIfClosed();
promise.setFailure(t);
closeIfClosed();
}
}
}