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

Make sure ChannelFuture of Bootstrap.bind() and connect() notify with the right cause when registration fails

Browse Source 
- Related: #1175
This commit is contained in:
Trustin Lee 2013-03-21 19:40:52 +09:00
parent b6dd5938ab
commit 4fa7e85493
1 changed files with 50 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
transport/src/main/java/io/netty/bootstrap/Bootstrap.java
View File

@ -77,14 +77,34 @@ public final class Bootstrap extends AbstractBootstrap<Bootstrap, Channel> {
} }
@Override @Override
ChannelFuture doBind(SocketAddress localAddress) { ChannelFuture doBind(final SocketAddress localAddress) {
Channel channel = channelFactory().newChannel(); final Channel channel = channelFactory().newChannel();
ChannelPromise initPromise = init(channel); ChannelPromise initPromise = init(channel);
if (initPromise.cause() != null) { if (initPromise.cause() != null) {
return initPromise; return initPromise;
} }
return channel.bind(localAddress).addListener(ChannelFutureListener.CLOSE_ON_FAILURE); final ChannelPromise promise = channel.newPromise();
if (initPromise.isDone()) {
doBind0(initPromise, channel, localAddress, promise);
} else {
initPromise.addListener(new ChannelFutureListener() {
@Override
public void operationComplete(ChannelFuture future) throws Exception {
doBind0(future, channel, localAddress, promise);
}
});
}
return promise;
}
private static void doBind0(ChannelFuture initFuture, Channel channel, SocketAddress localAddress, ChannelPromise promise) {
if (initFuture.isSuccess()) {
channel.bind(localAddress, promise).addListener(ChannelFutureListener.CLOSE_ON_FAILURE);
} else {
promise.setFailure(initFuture.cause());
}
} }
/** /**
@ -140,21 +160,42 @@ public final class Bootstrap extends AbstractBootstrap<Bootstrap, Channel> {
/** /**
* @see {@link #connect()} * @see {@link #connect()}
*/ */
private ChannelFuture doConnect(SocketAddress remoteAddress, SocketAddress localAddress) { private ChannelFuture doConnect(final SocketAddress remoteAddress, final SocketAddress localAddress) {
final Channel channel = channelFactory().newChannel(); final Channel channel = channelFactory().newChannel();
ChannelPromise initPromise = init(channel); ChannelPromise initPromise = init(channel);
if (initPromise.cause() != null) { if (initPromise.cause() != null) {
return initPromise; return initPromise;
} }
final ChannelFuture future; final ChannelPromise promise = channel.newPromise();
if (localAddress == null) { if (initPromise.isDone()) {
future = channel.connect(remoteAddress); doConnect0(initPromise, channel, remoteAddress, localAddress, promise);
} else { } else {
future = channel.connect(remoteAddress, localAddress); initPromise.addListener(new ChannelFutureListener() {
@Override
public void operationComplete(ChannelFuture future) throws Exception {
doConnect0(future, channel, remoteAddress, localAddress, promise);
}
});
} }
return future.addListener(ChannelFutureListener.CLOSE_ON_FAILURE); return promise;
}
private static void doConnect0(
ChannelFuture initFuture, Channel channel,
SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise) {
if (initFuture.isSuccess()) {
if (localAddress == null) {
channel.connect(remoteAddress, promise);
} else {
channel.connect(remoteAddress, localAddress, promise);
}
promise.addListener(ChannelFutureListener.CLOSE_ON_FAILURE);
} else {
promise.setFailure(initFuture.cause());
}
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")