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, 3 insertions, 2 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/di/Container.java b/container-core/src/main/java/com/yahoo/container/di/Container.java
index 8fc72d8cddb..8d8a05408a9 100644
--- a/container-core/src/main/java/com/yahoo/container/di/Container.java
+++ b/container-core/src/main/java/com/yahoo/container/di/Container.java
@@ -245,10 +245,11 @@ public class Container {
         }
     }
 
-    public void shutdown(ComponentGraph graph, ComponentDeconstructor deconstructor) {
+    public void shutdown(ComponentGraph graph) {
         shutdownConfigurer();
         if (graph != null) {
-            deconstructAllComponents(graph, deconstructor);
+            deconstructAllComponents(graph, componentDeconstructor);
+            componentDeconstructor.shutdown();
         }
     }