Adapt to latest changes in vertx core

eclipse-vertx · Sep 4, 2024 · ec6bff1 · ec6bff1
1 parent a9d9472
commit ec6bff1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ConnectionFactoryBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ConnectionFactoryBase.java
@@ -51,7 +51,7 @@ private void doClose(Promise<Void> p) {
   }
 
   public static ContextInternal asEventLoopContext(ContextInternal ctx) {
-    return ctx.asEventLoopContext();
+    return ctx.owner().createEventLoopContext(ctx.nettyEventLoop(), ctx.owner().getWorkerPool(), ctx.classLoader());
   }
 
   public Future<Connection> connect(ContextInternal context, C options) {

diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SocketConnectionBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SocketConnectionBase.java
@@ -162,8 +162,8 @@ public boolean isValid() {
 
   @Override
   public void init(Holder holder) {
-    Context context = Vertx.currentContext();
-    if (context != this.context) {
+    ContextInternal context = (ContextInternal) Vertx.currentContext();
+    if (context == null || context.nettyEventLoop() != this.context.nettyEventLoop()) {
       throw new IllegalStateException();
     }
     if (status != Status.CONNECTED) {