diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-10-31 09:18:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-31 09:18:21 +0100 |
| commit | cfede8e29baba06d2bb8fbf456df826e1a2d06db (patch) | |
| tree | 2a077b4779a0948327d7492f6ab07175c9964546 | |
| parent | fd12dbad953493e1c4fa6d8f9a3a805a1c7f7e40 (diff) | |
| parent | 1f66eb40313c1b0d240fc501868b503069a39804 (diff) | |
Merge pull request #3945 from vespa-engine/gjoranv/check-for-null-components
Throw exception if null componentsConfig.
| -rw-r--r-- | container-di/src/main/scala/com/yahoo/container/di/Container.scala | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/container-di/src/main/scala/com/yahoo/container/di/Container.scala b/container-di/src/main/scala/com/yahoo/container/di/Container.scala index c82625bae3b..c6812c52242 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/Container.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/Container.scala @@ -183,6 +183,9 @@ class Container( val graph = new ComponentGraph(generation) val componentsConfig = getConfig(componentsConfigKey, configsIncludingBootstrapConfigs) + if (componentsConfig == null) + throw new ConfigurationRuntimeException( + "The set of all configs does not include a valid 'components' config. Config set: " + configsIncludingBootstrapConfigs.keySet) addNodes(componentsConfig, graph) injectNodes(componentsConfig, graph) |