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

Additional fix for potential race condition which occurs when a user cancels a connection attempt

Browse Source 
- Fixes #1986
This commit is contained in:
Trustin Lee 2013-11-18 17:00:23 +09:00
parent 54d3c99469
commit fd776274c9
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,10 +167,7 @@ public abstract class AbstractNioChannel extends AbstractChannel {
boolean wasActive = isActive();
if (doConnect(remoteAddress, localAddress)) {
promise.setSuccess();
if (!wasActive && isActive()) {
pipeline().fireChannelActive();
}
fulfillConnectPromise(promise, wasActive);
} else {
connectPromise = promise;
requestedRemoteAddress = remoteAddress;
@ -215,6 +212,22 @@ public abstract class AbstractNioChannel extends AbstractChannel {
}
}
private void fulfillConnectPromise(ChannelPromise promise, boolean wasActive) {
// trySuccess() will return false if a user cancelled the connection attempt.
boolean promiseSet = promise.trySuccess();
// Regardless if the connection attempt was cancelled, channelActive() event should be triggered,
// because what happened is what happened.
if (!wasActive && isActive()) {
pipeline().fireChannelActive();
}
// If a user cancelled the connection attempt, close the channel, which is followed by channelInactive().
if (!promiseSet) {
close(voidPromise());
}
}
@Override
public void finishConnect() {
// Note this method is invoked by the event loop only if the connection attempt was
@ -226,10 +239,7 @@ public abstract class AbstractNioChannel extends AbstractChannel {
try {
boolean wasActive = isActive();
doFinishConnect();
connectPromise.setSuccess();
if (!wasActive && isActive()) {
pipeline().fireChannelActive();
}
fulfillConnectPromise(connectPromise, wasActive);
} catch (Throwable t) {
if (t instanceof ConnectException) {
Throwable newT = new ConnectException(t.getMessage() + ": " + requestedRemoteAddress);