Redesign ComponentDeconstructor to start deconstruction immediately

There is no need to wait with deconstruction after new generation
as the container knows when an old graph can be safely GCed.
Add shutdown() that waits for all previous graphs to complete deconstruction.

1 files changed, 2 insertions, 2 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 cf81b39db06..d686bb9a3dd 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
@@ -351,7 +351,7 @@ public final class ConfiguredApplication implements Application {
         return new HandlersConfigurerDi(subscriberFactory,
                                         Container.get(),
                                         configId,
-                                        new Deconstructor(Deconstructor.Mode.RECONFIG),
+                                        new Deconstructor(),
                                         discInjector,
                                         osgiFramework);
     }
@@ -385,7 +385,7 @@ public final class ConfiguredApplication implements Application {
         CountDownLatch latch = new CountDownLatch(1);
         activator.activateContainer(null)
                 .notifyTermination(() -> {
-                    configurer.shutdown(new Deconstructor(Deconstructor.Mode.SHUTDOWN));
+                    configurer.shutdown();
                     slobrokConfigSubscriber.ifPresent(SlobrokConfigSubscriber::shutdown);
                     Container.get().shutdown();
                     unregisterInSlobrok();