Clean up CurrentConfig on shutdown

To avoid ClassLoader leaks.
quarkusio · Aug 18, 2023 · bbaa305 · bbaa305
1 parent 14739af
commit bbaa305
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/...ttp/deployment/src/main/java/io/quarkus/devui/deployment/menu/ConfigurationProcessor.java b/...ttp/deployment/src/main/java/io/quarkus/devui/deployment/menu/ConfigurationProcessor.java
@@ -24,6 +24,7 @@
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.ConfigDescriptionBuildItem;
+import io.quarkus.deployment.builditem.CuratedApplicationShutdownBuildItem;
 import io.quarkus.deployment.builditem.DevServicesLauncherConfigResultBuildItem;
 import io.quarkus.dev.config.CurrentConfig;
 import io.quarkus.dev.console.DevConsoleManager;
@@ -95,7 +96,8 @@ void registerConfigs(List<ConfigDescriptionBuildItem> configDescriptionBuildItem
     void registerJsonRpcService(
             BuildProducer<JsonRPCProvidersBuildItem> jsonRPCProvidersProducer,
             BuildProducer<SyntheticBeanBuildItem> syntheticBeanProducer,
-            ConfigDevUIRecorder recorder) {
+            ConfigDevUIRecorder recorder,
+            CuratedApplicationShutdownBuildItem shutdown) {
 
         DevConsoleManager.register("config-update-property", map -> {
             Map<String, String> values = Collections.singletonMap(map.get("name"), map.get("value"));
@@ -116,6 +118,13 @@ void registerJsonRpcService(
                         .done());
 
         CurrentConfig.EDITOR = ConfigurationProcessor::updateConfig;
+        shutdown.addCloseTask(new Runnable() {
+            @Override
+            public void run() {
+                CurrentConfig.EDITOR = null;
+                CurrentConfig.CURRENT = Collections.emptyList();
+            }
+        }, true);
 
         jsonRPCProvidersProducer.produce(new JsonRPCProvidersBuildItem("devui-configuration", ConfigJsonRPCService.class));
     }