When a AsyncResolveBindConnectHelper is already succeeded the listene…

…r callback should be on the channel event loop

src/main/java/io/vertx/core/http/impl/ConnectionManager.java

@@ -18,7 +18,6 @@
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.channel.ChannelInitializer;
@@ -276,10 +275,10 @@ public void connect(VertxInternal vertx, Bootstrap bootstrap, HttpClientOptions
               protected void initChannel(Channel ch) throws Exception {
               }
             });
-            AsyncResolveBindConnectHelper<ChannelFuture> future = AsyncResolveBindConnectHelper.doConnect(vertx, port, host, bootstrap);
+            AsyncResolveBindConnectHelper future = AsyncResolveBindConnectHelper.doConnect(vertx, port, host, bootstrap);
             future.addListener(res -> {
               if (res.succeeded()) {
-                channelHandler.handle(Future.succeededFuture(res.result().channel()));
+                channelHandler.handle(Future.succeededFuture(res.result()));
               } else {
                 channelHandler.handle(Future.failedFuture(res.cause()));
               }

src/main/java/io/vertx/core/http/impl/HttpServerImpl.java

@@ -101,7 +101,7 @@ public class HttpServerImpl implements HttpServer, Closeable, MetricsProvider {
 
   private ChannelGroup serverChannelGroup;
   private volatile boolean listening;
-  private AsyncResolveBindConnectHelper<ChannelFuture> bindFuture;
+  private AsyncResolveBindConnectHelper bindFuture;
   private ServerID id;
   private HttpServerImpl actualServer;
   private volatile int actualPort;
@@ -255,7 +255,7 @@ protected void configurePipeline(ChannelHandlerContext ctx, String protocol) thr
             if (res.failed()) {
               vertx.sharedHttpServers().remove(id);
             } else {
-              Channel serverChannel = res.result().channel();
+              Channel serverChannel = res.result();
               HttpServerImpl.this.actualPort = ((InetSocketAddress)serverChannel.localAddress()).getPort();
               serverChannelGroup.add(serverChannel);
               metrics = vertx.metricsSPI().createMetrics(this, new SocketAddressImpl(port, host), options);

src/main/java/io/vertx/core/net/impl/AsyncResolveBindConnectHelper.java

@@ -18,6 +18,7 @@
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Future;
@@ -32,27 +33,30 @@
 /**
  * @author <a href="http://tfox.org">Tim Fox</a>
  */
-public class AsyncResolveBindConnectHelper<T> implements Handler<AsyncResult<T>> {
+public class AsyncResolveBindConnectHelper {
 
-  private List<Handler<AsyncResult<T>>> handlers = new ArrayList<>();
-  private boolean complete;
-  private AsyncResult<T> result;
+  private List<Handler<AsyncResult<Channel>>> handlers = new ArrayList<>();
+  private ChannelFuture future;
+  private AsyncResult<Channel> result;
 
-  public synchronized void addListener(Handler<AsyncResult<T>> handler) {
-    if (complete) {
-      handler.handle(result);
+  public synchronized void addListener(Handler<AsyncResult<Channel>> handler) {
+    if (result != null) {
+      if (future != null) {
+        future.addListener(v -> handler.handle(result));
+      } else {
+        handler.handle(result);
+      }
     } else {
       handlers.add(handler);
     }
   }
 
-  @Override
-  public synchronized void handle(AsyncResult<T> res) {
-    if (!complete) {
-      for (Handler<AsyncResult<T>> handler: handlers) {
+  private synchronized void handle(ChannelFuture cf, AsyncResult<Channel> res) {
+    if (result == null) {
+      for (Handler<AsyncResult<Channel>> handler: handlers) {
         handler.handle(res);
       }
-      complete = true;
+      future = cf;
       result = res;
     } else {
       throw new IllegalStateException("Already complete!");
@@ -65,35 +69,35 @@ private static void checkPort(int port) {
     }
   }
 
-  public static AsyncResolveBindConnectHelper<ChannelFuture> doBind(VertxInternal vertx, int port, String host,
+  public static AsyncResolveBindConnectHelper doBind(VertxInternal vertx, int port, String host,
                                                                     ServerBootstrap bootstrap) {
     return doBindConnect(vertx, port, host, bootstrap::bind);
   }
 
-  public static AsyncResolveBindConnectHelper<ChannelFuture> doConnect(VertxInternal vertx, int port, String host,
+  public static AsyncResolveBindConnectHelper doConnect(VertxInternal vertx, int port, String host,
                                                                        Bootstrap bootstrap) {
     return doBindConnect(vertx, port, host, bootstrap::connect);
   }
 
-  private static AsyncResolveBindConnectHelper<ChannelFuture> doBindConnect(VertxInternal vertx, int port, String host,
+  private static AsyncResolveBindConnectHelper doBindConnect(VertxInternal vertx, int port, String host,
                                                                             Function<InetSocketAddress,
                                                                             ChannelFuture> cfProducer) {
     checkPort(port);
-    AsyncResolveBindConnectHelper<ChannelFuture> asyncResolveBindConnectHelper = new AsyncResolveBindConnectHelper<>();
+    AsyncResolveBindConnectHelper asyncResolveBindConnectHelper = new AsyncResolveBindConnectHelper();
     vertx.resolveHostname(host, res -> {
       if (res.succeeded()) {
         // At this point the name is an IP address so there will be no resolve hit
         InetSocketAddress t = new InetSocketAddress(res.result(), port);
         ChannelFuture future = cfProducer.apply(t);
         future.addListener(f -> {
           if (f.isSuccess()) {
-            asyncResolveBindConnectHelper.handle(Future.succeededFuture(future));
+            asyncResolveBindConnectHelper.handle(future, Future.succeededFuture(future.channel()));
           } else {
-            asyncResolveBindConnectHelper.handle(Future.failedFuture(f.cause()));
+            asyncResolveBindConnectHelper.handle(future, Future.failedFuture(f.cause()));
           }
         });
       } else {
-        asyncResolveBindConnectHelper.handle(Future.failedFuture(res.cause()));
+        asyncResolveBindConnectHelper.handle(null, Future.failedFuture(res.cause()));
       }
     });
     return asyncResolveBindConnectHelper;

src/main/java/io/vertx/core/net/impl/NetClientImpl.java

@@ -171,12 +171,12 @@ protected void initChannel(Channel ch) throws Exception {
     });
 
     applyConnectionOptions(bootstrap);
-    AsyncResolveBindConnectHelper<ChannelFuture> future = AsyncResolveBindConnectHelper.doConnect(vertx, port, host, bootstrap);
+    AsyncResolveBindConnectHelper future = AsyncResolveBindConnectHelper.doConnect(vertx, port, host, bootstrap);
     future.addListener(res -> {
 
       if (res.succeeded()) {
 
-        Channel ch = res.result().channel();
+        Channel ch = res.result();
 
         if (sslHelper.isSSL()) {
           // TCP connected, so now we must do the SSL handshake

src/main/java/io/vertx/core/net/impl/NetServerImpl.java

@@ -72,7 +72,7 @@ public class NetServerImpl implements NetServer, Closeable, MetricsProvider {
   private volatile boolean listening;
   private volatile ServerID id;
   private NetServerImpl actualServer;
-  private AsyncResolveBindConnectHelper<ChannelFuture> bindFuture;
+  private AsyncResolveBindConnectHelper bindFuture;
   private volatile int actualPort;
   private ContextImpl listenContext;
   private TCPMetrics metrics;
@@ -189,7 +189,7 @@ protected void initChannel(Channel ch) throws Exception {
           bindFuture = AsyncResolveBindConnectHelper.doBind(vertx, port, host, bootstrap);
           bindFuture.addListener(res -> {
             if (res.succeeded()) {
-              Channel ch = res.result().channel();
+              Channel ch = res.result();
               log.trace("Net server listening on " + host + ":" + ch.localAddress());
               // Update port to actual port - wildcard port 0 might have been used
               NetServerImpl.this.actualPort = ((InetSocketAddress)ch.localAddress()).getPort();