summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-11-21 21:44:00 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2018-11-21 21:44:00 +0100
commit11ee6bc258c907cbbd8d725fb8204968016ee554 (patch)
tree3c46244f46dd819322e4b29037802dbd13463e5a /config-model
parent8a59daf55c312810ce5648a3f37259c487519861 (diff)
Follow api change.
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java4
-rwxr-xr-xconfig-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java2
2 files changed, 2 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
index fe83148d7af..a1b3a0cd9c0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
@@ -412,8 +412,8 @@ public class IndexedSearchCluster extends SearchCluster
builder.minGroupCoverage(tuning.dispatch.minGroupCoverage);
if (tuning.dispatch.policy != null) {
switch (tuning.dispatch.policy) {
- case RANDOM:
- builder.distributionPolicy(DistributionPolicy.RANDOM);
+ case ADAPTIVE:
+ builder.distributionPolicy(DistributionPolicy.ADAPTIVE);
break;
case ROUNDROBIN:
builder.distributionPolicy(DistributionPolicy.ROUNDROBIN);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
index 4bdb809f546..dff21904c75 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
@@ -12,9 +12,7 @@ import com.yahoo.vespa.model.VespaModel;
import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
import org.junit.Test;
import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-import java.io.IOException;
import java.io.StringReader;
import static org.hamcrest.CoreMatchers.is;