diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-01-24 16:26:58 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-01-25 09:43:56 +0100 |
commit | 971037fe260c6bdbcb4f8f99780853dbf17c8ebc (patch) | |
tree | 71f537681a58ca042c8126b1bd4f16fcc38c8226 /container-core/src/main/java/com/yahoo/container/di | |
parent | ea3db7f2a4c13ef06acbbf03075d287d9512f188 (diff) |
Rename methods that implicitly waits for a new config generation
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/di')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/di/Container.java | 10 |
1 files changed, 4 insertions, 6 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 bb6b11c77ae..844d1dc1151 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 @@ -71,10 +71,10 @@ public class Container { }); } - public ComponentGraph getNewComponentGraph(ComponentGraph oldGraph, Injector fallbackInjector, boolean isInitializing) { + public ComponentGraph waitForNextComponentGeneration(ComponentGraph oldGraph, Injector fallbackInjector, boolean isInitializing) { try { Collection<Bundle> obsoleteBundles = new HashSet<>(); - ComponentGraph newGraph = getConfigAndCreateGraph(oldGraph, fallbackInjector, isInitializing, obsoleteBundles); + ComponentGraph newGraph = waitForNewConfigGenAndCreateGraph(oldGraph, fallbackInjector, isInitializing, obsoleteBundles); newGraph.reuseNodes(oldGraph); constructComponents(newGraph); deconstructObsoleteComponents(oldGraph, newGraph, obsoleteBundles); @@ -85,10 +85,8 @@ public class Container { } } - private ComponentGraph getConfigAndCreateGraph(ComponentGraph graph, - Injector fallbackInjector, - boolean isInitializing, - Collection<Bundle> obsoleteBundles) // NOTE: Return value + private ComponentGraph waitForNewConfigGenAndCreateGraph( + ComponentGraph graph, Injector fallbackInjector, boolean isInitializing, Collection<Bundle> obsoleteBundles) // NOTE: Return value { ConfigSnapshot snapshot; while (true) { |