Merge pull request #24141 from geoand/#24088

Close VirtualBootstrap channel on dev-mode restart
quarkusio · Mar 7, 2022 · 5a9db9d · 5a9db9d
2 parents 40643d8 + a49ec2d
commit 5a9db9d
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/...ons/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java b/...ons/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java
@@ -41,6 +41,7 @@
 import org.wildfly.common.cpu.ProcessorInfo;
 
 import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelInitializer;
 import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpResponseStatus;
@@ -263,7 +264,16 @@ public void startServer(Supplier<Vertx> vertx, ShutdownContext shutdown,
 
         if (startVirtual) {
             initializeVirtual(vertx.get());
-            shutdown.addShutdownTask(() -> virtualBootstrap = null);
+            shutdown.addShutdownTask(() -> {
+                try {
+                    virtualBootstrapChannel.channel().close().sync();
+                } catch (InterruptedException e) {
+                    LOGGER.warn("Unable to close virtualBootstrapChannel");
+                } finally {
+                    virtualBootstrapChannel = null;
+                    virtualBootstrap = null;
+                }
+            });
         }
         HttpConfiguration httpConfiguration = this.httpConfiguration.getValue();
         if (startSocket && (httpConfiguration.hostEnabled || httpConfiguration.domainSocketEnabled)) {
@@ -1189,6 +1199,7 @@ private String propertyWithProfilePrefix(String portPropertyName) {
     }
 
     protected static ServerBootstrap virtualBootstrap;
+    protected static ChannelFuture virtualBootstrapChannel;
     public static VirtualAddress VIRTUAL_HTTP = new VirtualAddress("netty-virtual-http");
 
     private static void initializeVirtual(Vertx vertxRuntime) {
@@ -1235,7 +1246,7 @@ public void initChannel(VirtualChannel ch) throws Exception {
 
         // Start the server.
         try {
-            virtualBootstrap.bind(VIRTUAL_HTTP).sync();
+            virtualBootstrapChannel = virtualBootstrap.bind(VIRTUAL_HTTP).sync();
         } catch (InterruptedException e) {
             throw new RuntimeException("failed to bind virtual http");
         }