diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-08-14 08:21:18 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2019-08-14 08:21:18 +0200 |
commit | af8ac01b3883882c792cc872b03aa77ef81a179a (patch) | |
tree | 79e761fd933bcd1b90fa37da720d597fb0c72137 /config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java | |
parent | 23566b7d1b574cf21bfdfc587706f2bddebc29c9 (diff) |
Cleanup of config definition name and namespace
Config definition name and namespace are mandatory, so no need
to fallback to default namespace anymore
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java index d07f6c4e6fd..31231857aae 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java @@ -86,11 +86,15 @@ public class DomConfigPayloadBuilder { } private static boolean validName(String name) { + if (name == null) return false; + Matcher m = namePattern.matcher(name); return m.matches(); } private static boolean validNamespace(String namespace) { + if (namespace == null) return false; + Matcher m = namespacePattern.matcher(namespace); return m.matches(); } |