summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-01-23 12:59:48 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2018-01-25 13:33:59 +0000
commitf5aed83382da798f23b0d08e4543f2bb2de4bc97 (patch)
tree85c2a79762fe8adba8606e4f68220574f196cb7c
parent5b19b6518acc92959d9b886209342ed243a9ed6d (diff)
Split on uri and file.
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/search/AbstractSearchCluster.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/AbstractSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/AbstractSearchCluster.java
index 58fc76f1508..44d1775c6f0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/AbstractSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/AbstractSearchCluster.java
@@ -38,7 +38,9 @@ public abstract class AbstractSearchCluster extends AbstractConfigProducer
public void prepareToDistributeFiles(List<SearchNode> backends) {
for (SearchDefinitionSpec sds : localSDS) {
for (RankingConstant constant : sds.getSearchDefinition().getSearch().getRankingConstants().values()) {
- FileReference reference = FileSender.sendFileToServices(constant.getFileName(), backends);
+ FileReference reference = (constant.getPathType() == RankingConstant.PathType.FILE)
+ ? FileSender.sendFileToServices(constant.getFileName(), backends)
+ : FileSender.sendUriToServices(constant.getUri(), backends);;
constant.setFileReference(reference.value());
}
}