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

Make sure Channel connected event is not fired on connect failure. See #249

Browse Source
This commit is contained in:
norman 2012-04-04 07:40:50 +02:00
parent 049fb35bc1
commit db87c6ea37
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
transport-sctp/src/main/java/io/netty/channel/sctp/SctpWorker.java
View File

@ -215,7 +215,6 @@ public class SctpWorker extends NioWorker {
protected void connect(SelectionKey k) { protected void connect(SelectionKey k) {
final SctpClientChannel ch = (SctpClientChannel) k.attachment(); final SctpClientChannel ch = (SctpClientChannel) k.attachment();
try { try {
// TODO: Remove cast
if (ch.getJdkChannel().finishConnect()) { if (ch.getJdkChannel().finishConnect()) {
registerTask(ch, ch.connectFuture); registerTask(ch, ch.connectFuture);
} }
@ -358,7 +357,13 @@ public class SctpWorker extends NioWorker {
((SctpChannelImpl) channel).setConnected(); ((SctpChannelImpl) channel).setConnected();
future.setSuccess(); future.setSuccess();
} }
if (!server) {
if (!((SctpClientChannel) channel).boundManually) {
fireChannelBound(channel, localAddress);
}
fireChannelConnected(channel, remoteAddress);
}
} catch (IOException e) { } catch (IOException e) {
if (future != null) { if (future != null) {
future.setFailure(e); future.setFailure(e);
@ -369,13 +374,6 @@ public class SctpWorker extends NioWorker {
"Failed to register a socket to the selector.", e); "Failed to register a socket to the selector.", e);
} }
} }
if (!server) {
if (!((SctpClientChannel) channel).boundManually) {
fireChannelBound(channel, localAddress);
}
fireChannelConnected(channel, remoteAddress);
}
} }
@Override @Override

9
transport/src/main/java/io/netty/channel/socket/nio/NioWorker.java
View File

@ -140,6 +140,10 @@ public class NioWorker extends SelectorEventLoop {
} }
future.setSuccess(); future.setSuccess();
} }
if (server || !((NioClientSocketChannel) channel).boundManually) {
fireChannelBound(channel, localAddress);
}
fireChannelConnected(channel, remoteAddress);
} catch (IOException e) { } catch (IOException e) {
if (future != null) { if (future != null) {
@ -151,11 +155,6 @@ public class NioWorker extends SelectorEventLoop {
"Failed to register a socket to the selector.", e); "Failed to register a socket to the selector.", e);
} }
} }
if (server || !((NioClientSocketChannel) channel).boundManually) {
fireChannelBound(channel, localAddress);
}
fireChannelConnected(channel, remoteAddress);
} }
} }