From 33f9d55bc43a2e52dd8115f97360e1e8fb708581 Mon Sep 17 00:00:00 2001 From: norman Date: Wed, 4 Apr 2012 07:43:52 +0200 Subject: [PATCH] Make sure Channel connected event is not fired on connect failure. See #249 --- .../org/jboss/netty/channel/socket/nio/NioWorker.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java index 21c4ca2e74..427505fe79 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java @@ -186,6 +186,11 @@ public class NioWorker extends AbstractNioWorker { channel.setConnected(); future.setSuccess(); } + + if (server || !((NioClientSocketChannel) channel).boundManually) { + fireChannelBound(channel, localAddress); + } + fireChannelConnected(channel, remoteAddress); } catch (IOException e) { if (future != null) { future.setFailure(e); @@ -197,10 +202,6 @@ public class NioWorker extends AbstractNioWorker { } } - if (server || !((NioClientSocketChannel) channel).boundManually) { - fireChannelBound(channel, localAddress); - } - fireChannelConnected(channel, remoteAddress); } }