diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-05-13 15:53:53 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-05-13 15:53:53 +0200 |
commit | f05f428ccdef7a916fd90f247315784eb5dff05c (patch) | |
tree | dd852fd4c2264f5bbabd5eb6e8dc13e1151b8683 /container-di/src/main/java/com | |
parent | 705b8d9f0f4631bf7c953ae996190cb4d886039a (diff) |
Non-functional changes only
Diffstat (limited to 'container-di/src/main/java/com')
-rw-r--r-- | container-di/src/main/java/com/yahoo/container/di/Container.java | 4 | ||||
-rw-r--r-- | container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/container-di/src/main/java/com/yahoo/container/di/Container.java b/container-di/src/main/java/com/yahoo/container/di/Container.java index d8fec35633b..dcdd1767c9c 100644 --- a/container-di/src/main/java/com/yahoo/container/di/Container.java +++ b/container-di/src/main/java/com/yahoo/container/di/Container.java @@ -140,7 +140,7 @@ public class Container { snapshot = configurer.getConfigs(graph.configKeys(), leastGeneration, restartOnRedeploy); log.log(FINE, String.format("createNewGraph:\n" + "graph.configKeys = %s\n" + "graph.generation = %s\n" + "snapshot = %s\n", - graph.configKeys(), graph.generation(), snapshot)); + graph.configKeys(), graph.generation(), snapshot)); if (snapshot instanceof BootstrapConfigs) { if (getBootstrapGeneration() <= previousConfigGeneration) { @@ -182,7 +182,7 @@ public class Container { } private ComponentGraph createAndConfigureComponentsGraph(Map<ConfigKey<? extends ConfigInstance>, ConfigInstance> componentsConfigs, - Injector fallbackInjector) { + Injector fallbackInjector) { ComponentGraph componentGraph = createComponentsGraph(componentsConfigs, getComponentsGeneration(), fallbackInjector); componentGraph.setAvailableConfigs(componentsConfigs); return componentGraph; diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java index fdaaf4b698d..2e4db01fb1b 100644 --- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java +++ b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java @@ -142,8 +142,7 @@ public class ComponentGraph { } public void setAvailableConfigs(Map<ConfigKey<? extends ConfigInstance>, ConfigInstance> configs) { - Map<ConfigKey<ConfigInstance>, ConfigInstance> invariantMap = Keys.invariantCopy(configs); - componentNodes().forEach(node -> node.setAvailableConfigs(invariantMap)); + componentNodes().forEach(node -> node.setAvailableConfigs(Keys.invariantCopy(configs))); } public void reuseNodes(ComponentGraph old) { |