diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-01-25 13:45:33 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-01-25 13:45:33 +0100 |
| commit | 144216ecb6712be44fb1dce5ab637159750bc9b3 (patch) | |
| tree | 4da8a163500038dd06b424e73459e6538c94dd61 /container-core/src/main/java/com/yahoo/container/core/config | |
| parent | 1608bedc17ea020f0a5a4834552aded54e82ab5d (diff) | |
Rename methods to 'waitForNextGraphGeneration'
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/core/config')
2 files changed, 4 insertions, 4 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java index 7148ed6fb45..716f7b496b1 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java @@ -71,7 +71,7 @@ public class HandlersConfigurerDi { this.vespaContainer = vespaContainer; container = new Container(subscriberFactory, configId, deconstructor, osgiWrapper); - Runnable cleanupTask = waitForNextComponentGeneration(discInjector, true); + Runnable cleanupTask = waitForNextGraphGeneration(discInjector, true); cleanupTask.run(); } @@ -109,8 +109,8 @@ public class HandlersConfigurerDi { * Wait for new config to arrive and produce the new graph * @return Task for deconstructing previous component graph and bundles */ - public Runnable waitForNextComponentGeneration(Injector discInjector, boolean isInitializing) { - Container.ComponentGraphResult result = container.waitForNextComponentGeneration( + public Runnable waitForNextGraphGeneration(Injector discInjector, boolean isInitializing) { + Container.ComponentGraphResult result = container.waitForNextGraphGeneration( this.currentGraph, createFallbackInjector(vespaContainer, discInjector), isInitializing); diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java index c96f90bc0b3..b9ff5a08785 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java @@ -120,7 +120,7 @@ public class HandlersConfigurerTestWrapper { public void reloadConfig() { configurer.reloadConfig(++lastGeneration); - Runnable cleanupTask = configurer.waitForNextComponentGeneration(guiceInjector(), false); + Runnable cleanupTask = configurer.waitForNextGraphGeneration(guiceInjector(), false); cleanupTask.run(); } |