Fix race

Author: vietj

vertx-db2-client/src/main/java/io/vertx/db2client/spi/DB2Driver.java

@@ -61,7 +61,7 @@ private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<Future<DB2ConnectOpti
     boolean pipelinedPool = options instanceof Db2PoolOptions && ((Db2PoolOptions) options).isPipelined();
     PoolImpl pool = new PoolImpl(vertx, this, pipelinedPool, options, null, null, closeFuture);
     ConnectionFactory<DB2ConnectOptions> factory = createConnectionFactory(vertx);
-    pool.connectionProvider(context -> databases.get().compose(connectOptions -> factory.connect(context, connectOptions)));
+    pool.connectionProvider(context -> factory.connect(context, databases.get()));
     pool.init();
     closeFuture.add(factory);
     return pool;

vertx-mssql-client/src/main/java/io/vertx/mssqlclient/spi/MSSQLDriver.java

@@ -63,7 +63,7 @@ public Pool newPool(Vertx vertx, Supplier<Future<MSSQLConnectOptions>> databases
   private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<Future<MSSQLConnectOptions>> databases, PoolOptions options, CloseFuture closeFuture) {
     PoolImpl pool = new PoolImpl(vertx, this, false, options, null, null, closeFuture);
     ConnectionFactory<MSSQLConnectOptions> factory = createConnectionFactory(vertx);
-    pool.connectionProvider(context -> databases.get().compose(connectOptions -> factory.connect(context, connectOptions)));
+    pool.connectionProvider(context -> factory.connect(context, databases.get()));
     pool.init();
     closeFuture.add(factory);
     return pool;

vertx-mysql-client/src/main/java/io/vertx/mysqlclient/spi/MySQLDriver.java

@@ -61,7 +61,7 @@ private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<Future<MySQLConnectOp
     boolean pipelinedPool = options instanceof MySQLPoolOptions && ((MySQLPoolOptions) options).isPipelined();
     PoolImpl pool = new PoolImpl(vertx, this, pipelinedPool, options, null, null, closeFuture);
     ConnectionFactory<MySQLConnectOptions> factory = createConnectionFactory(vertx);
-    pool.connectionProvider(context -> databases.get().compose(connectOptions -> factory.connect(context, connectOptions)));
+    pool.connectionProvider(context -> factory.connect(context, databases.get()));
     pool.init();
     closeFuture.add(factory);
     return pool;

vertx-oracle-client/src/main/java/io/vertx/oracleclient/spi/OracleDriver.java

@@ -58,7 +58,7 @@ private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<Future<OracleConnectO
     Function<Connection, Future<Void>> beforeRecycle = conn -> ((OracleJdbcConnection) conn).beforeRecycle();
     PoolImpl pool = new PoolImpl(vertx, this,  false, options, afterAcquire, beforeRecycle, closeFuture);
     ConnectionFactory<OracleConnectOptions> factory = createConnectionFactory(vertx);
-    pool.connectionProvider(context -> databases.get().compose(connectOptions -> factory.connect(context, connectOptions)));
+    pool.connectionProvider(context -> factory.connect(context, databases.get()));
     pool.init();
     closeFuture.add(factory);
     return pool;

vertx-pg-client/src/main/java/io/vertx/pgclient/spi/PgDriver.java

@@ -41,7 +41,7 @@ private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<Future<PgConnectOptio
     boolean pipelinedPool = options instanceof PgPoolOptions && ((PgPoolOptions) options).isPipelined();
     PoolImpl pool = new PoolImpl(vertx, this, pipelinedPool, options, null, null, closeFuture);
     ConnectionFactory<PgConnectOptions> factory = createConnectionFactory(vertx);
-    pool.connectionProvider(context -> databases.get().compose(connectOptions -> factory.connect(context, connectOptions)));
+    pool.connectionProvider(context -> factory.connect(context, databases.get()));
     pool.init();
     closeFuture.add(factory);
     return pool;

vertx-sql-client/src/main/java/io/vertx/sqlclient/spi/ConnectionFactory.java

@@ -1,11 +1,9 @@
 package io.vertx.sqlclient.spi;
 
-import io.vertx.core.Closeable;
-import io.vertx.core.CompositeFuture;
-import io.vertx.core.Context;
-import io.vertx.core.Future;
-import io.vertx.core.Promise;
+import io.vertx.core.*;
+import io.vertx.core.impl.ContextInternal;
 import io.vertx.sqlclient.SqlConnectOptions;
+import io.vertx.core.Promise;
 import io.vertx.sqlclient.SqlConnection;
 
 import java.util.ArrayList;
@@ -18,6 +16,17 @@
  */
 public interface ConnectionFactory<C extends SqlConnectOptions> extends Closeable {
 
+  default Future<SqlConnection> connect(Context context, Future<C> fut) {
+    // The future might be on any context or context-less
+    // So we need to use a specific context promise
+    Promise<C> promise = ((ContextInternal) context).promise();
+    fut.onComplete(promise);
+    return promise
+      .future()
+      .compose(connectOptions -> connect(context, connectOptions));
+
+  }
+
   static <T> Supplier<Future<T>> roundRobinSupplier(List<T> factories) {
     return new Supplier<Future<T>>() {
       AtomicLong idx = new AtomicLong();