Move destruction of final component graph to destroy()

1 files changed, 2 insertions, 1 deletions

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
index de36ffd5a0d..606e2bf6cb4 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
@@ -403,7 +403,7 @@ public final class ConfiguredApplication implements Application {
         startAndStopServers(List.of());
         startAndRemoveClients(List.of());
         log.info(logPrefix + ": Waiting for all in-flight requests to complete");
-        activateContainer(null, () -> configurer.shutdown());
+        activateContainer(null, () -> {});
         nonTerminatedContainerTracker.arriveAndAwaitAdvance();
         log.info(logPrefix + ": Finished");
     }
@@ -428,6 +428,7 @@ public final class ConfiguredApplication implements Application {
     @Override
     public void destroy() {
         log.info("Destroy: Shutting down container now");
+        configurer.shutdown();
         slobrokConfigSubscriber.ifPresent(SlobrokConfigSubscriber::shutdown);
         Container.get().shutdown();
         unregisterInSlobrok();