From 1fce95eefd21a4a0686dbf8557cb540894029a1f Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Tue, 8 Dec 2020 13:35:44 +0100 Subject: Revert "Bratseth/simplify config take 2" --- .../java/com/yahoo/container/core/config/HandlersConfigurerDi.java | 7 ++++--- .../core/config/testutil/HandlersConfigurerTestWrapper.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'container-core') 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..af163e88fee 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, false); } 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 restartOnRedeploy) { currentGraph = container.getNewComponentGraph(currentGraph, - createFallbackInjector(vespaContainer, discInjector)); + createFallbackInjector(vespaContainer, discInjector), + restartOnRedeploy); } 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() { -- cgit v1.2.3