diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2020-12-16 22:15:52 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2020-12-16 22:15:52 +0100 |
| commit | b194c494bc568ced02a98695bc41219b170acf37 (patch) | |
| tree | 0e22193a21aeddb945663795232066c44fc2e3eb /container-core | |
| parent | 99ad735154f1aa3cd40b7d7028c11bf19225d1b3 (diff) | |
Track explicitly when we are initializing config
Diffstat (limited to 'container-core')
2 files changed, 5 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 ac632f5acce..26f11b98366 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 @@ -74,7 +74,7 @@ public class HandlersConfigurerDi { this.vespaContainer = vespaContainer; container = new Container(subscriberFactory, configId, deconstructor, osgiWrapper); - getNewComponentGraph(discInjector); + getNewComponentGraph(discInjector, true); } private static class ContainerAndDiOsgi extends OsgiImpl implements OsgiWrapper { @@ -128,9 +128,10 @@ public class HandlersConfigurerDi { /** * Wait for new config to arrive and produce the new graph */ - public void getNewComponentGraph(Injector discInjector) { + public void getNewComponentGraph(Injector discInjector, boolean isInitializing) { currentGraph = container.getNewComponentGraph(currentGraph, - createFallbackInjector(vespaContainer, discInjector)); + createFallbackInjector(vespaContainer, discInjector), + isInitializing); } private Injector createFallbackInjector(com.yahoo.container.Container vespaContainer, Injector discInjector) { 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 42e54d3a78f..d98a865e1fb 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 @@ -117,7 +117,7 @@ public class HandlersConfigurerTestWrapper { public void reloadConfig() { configurer.reloadConfig(++lastGeneration); - configurer.getNewComponentGraph(guiceInjector()); + configurer.getNewComponentGraph(guiceInjector(), false); } public void shutdown() { |