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

Ensure connect promise is notifed before fireChannelActive() is called. Related to [#4927]

Browse Source 
Motivation:

We should always first notify the promise before trigger an event through the pipeline to be consistent.

Modifications:

Ensure we notify the promise before fire event.

Result:

Consistent behavior
This commit is contained in:
Norman Maurer 2016-03-10 14:58:46 +01:00
parent c8b2633864
commit 0a959efc9e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDatagramChannel.java
View File

@ -502,6 +502,9 @@ public final class EpollDatagramChannel extends AbstractEpollChannel implements
EpollDatagramChannel.this.local = fd().localAddress(); EpollDatagramChannel.this.local = fd().localAddress();
success = true; success = true;
// First notify the promise before notifying the handler.
channelPromise.trySuccess();
// Regardless if the connection attempt was cancelled, channelActive() event should be triggered, // Regardless if the connection attempt was cancelled, channelActive() event should be triggered,
// because what happened is what happened. // because what happened is what happened.
if (!wasActive && isActive()) { if (!wasActive && isActive()) {
@ -511,12 +514,11 @@ public final class EpollDatagramChannel extends AbstractEpollChannel implements
if (!success) { if (!success) {
doClose(); doClose();
} else { } else {
channelPromise.setSuccess();
connected = true; connected = true;
} }
} }
} catch (Throwable cause) { } catch (Throwable cause) {
channelPromise.setFailure(cause); channelPromise.tryFailure(cause);
} }
} }