diff options
2 files changed, 5 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 1c47f1d7c9c..95b5d804e7b 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -928,8 +928,9 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { if (documentApiElement == null) return null; ContainerDocumentApi.HandlerOptions documentApiOptions = DocumentApiOptionsBuilder.build(documentApiElement); + Element ignoreUndefinedFields = XML.getChild(documentApiElement, "ignore-undefined-fields"); return new ContainerDocumentApi(cluster, documentApiOptions, - documentApiElement.getAttribute("ignore-undefined-fields").equals("true")); + "true".equals(XML.getValue(ignoreUndefinedFields))); } private ContainerDocproc buildDocproc(DeployState deployState, ApplicationContainerCluster cluster, Element spec) { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java index ca0b4681e51..61e0a9e15a4 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java @@ -91,8 +91,10 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa public void nonexisting_fields_can_be_ignored() { Element elem = DomBuilderTest.parse( "<container id='cluster1' version='1.0'>", - " <document-api ignore-undefined-fields='true' />", + " <document-api>" + + " <ignore-undefined-fields>true</ignore-undefined-fields>" + nodesXml, + " </document-api>" + "</container>"); ContainerModel model = createModel(root, elem).get(0); |