diff options
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java | 10 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java | 7 |
2 files changed, 4 insertions, 13 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java index 8c79b67f861..f03c80b4f78 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java @@ -132,16 +132,12 @@ public class DeployState implements ConfigDefinitionStore { } existingConfigDefs.putAll(applicationPackage.getAllExistingConfigDefs()); } - ConfigDefinitionKey lookupKey = defKey; + if ( ! existingConfigDefs.containsKey(defKey)) return Optional.empty(); - if ( ! existingConfigDefs.containsKey(lookupKey)) { - throw new IllegalArgumentException("Could not find a config definition with name '" + defKey + "'."); - } - if (defArchive.get(defKey) != null) { + if (defArchive.get(defKey) != null) return Optional.ofNullable(defArchive.get(defKey)); - } - ConfigDefinition def = existingConfigDefs.get(lookupKey).parse(); + ConfigDefinition def = existingConfigDefs.get(defKey).parse(); defArchive.put(defKey, def); return Optional.ofNullable(def); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java index bd93b733e1c..a4b334fcc28 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java @@ -65,12 +65,7 @@ public class UserConfigBuilder { * Returns the config definition matching the given name, or null if not found. */ private static ConfigDefinition getConfigDef(ConfigDefinitionKey configDefinitionKey, ConfigDefinitionStore configDefinitionStore) { - try { - return configDefinitionStore.getConfigDefinition(configDefinitionKey).orElse(null); - } catch (IllegalArgumentException e) { - log.log(LogLevel.DEBUG, "Unable to retrieve config definition: " + e.getMessage()); - return null; - } + return configDefinitionStore.getConfigDefinition(configDefinitionKey).orElse(null); } } |