diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-01-25 14:41:35 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-01-25 14:42:45 +0100 |
commit | d39c153e007d4b613ba7e4dbe3f222691861d1c8 (patch) | |
tree | 564cbe83ad8021807db872f70c5d6cb1b6f81e83 /container-core/src/main/java/com/yahoo/container/di/Container.java | |
parent | d7616adac5ab388192acfea71625296295909ee2 (diff) |
Include generation number in log message for deconstruction
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/di/Container.java')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/di/Container.java | 4 |
1 files changed, 2 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 8d8a05408a9..b37a7b9f69f 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 @@ -171,7 +171,7 @@ public class Container { if ( ! newComponents.containsKey(component)) obsoleteComponents.add(component); - return () -> componentDeconstructor.deconstruct(obsoleteComponents, obsoleteBundles); + return () -> componentDeconstructor.deconstruct(oldGraph.generation(), obsoleteComponents, obsoleteBundles); } private Set<Bundle> installApplicationBundles(Map<ConfigKey<? extends ConfigInstance>, ConfigInstance> configsIncludingBootstrapConfigs) { @@ -264,7 +264,7 @@ public class Container { private void deconstructAllComponents(ComponentGraph graph, ComponentDeconstructor deconstructor) { // This is only used for shutdown, so no need to uninstall any bundles. - deconstructor.deconstruct(graph.allConstructedComponentsAndProviders(), Collections.emptyList()); + deconstructor.deconstruct(graph.generation(), graph.allConstructedComponentsAndProviders(), Collections.emptyList()); } public static <T extends ConfigInstance> T getConfig(ConfigKey<T> key, |