summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2017-11-28 14:01:47 +0100
committerHarald Musum <musum@oath.com>2017-11-28 14:01:47 +0100
commit5b0fef5a317e7022af6f22203fa2fff6384f139c (patch)
tree7b0375d73eb362b051379901916abb93ec8fb3b9
parentf905e3b6698b4e7bccedc9d8951c628fbe142c8c (diff)
Backwards compatibility
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomFileDistributionOptionsBuilder.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomFileDistributionOptionsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomFileDistributionOptionsBuilder.java
index ef0984662b9..9cbdd00899b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomFileDistributionOptionsBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomFileDistributionOptionsBuilder.java
@@ -42,7 +42,8 @@ public class DomFileDistributionOptionsBuilder {
if (fileDistributionElement != null) {
getAmount("uploadbitrate", fileDistributionElement).ifPresent(fileDistributionOptions::uploadBitRate);
getAmount("downloadbitrate", fileDistributionElement).ifPresent(fileDistributionOptions::downloadBitRate);
- Element disable = XML.getChild(fileDistributionElement, "disableFiledistributor");
+ Element disable = XML.getChild(fileDistributionElement, "disabled");
+ if (disable == null) disable = XML.getChild(fileDistributionElement, "disableFiledistributor");
if (disable != null) {
fileDistributionOptions.disableFiledistributor(Boolean.valueOf(XML.getValue(disable)));
}