summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-01-25 20:30:33 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2018-01-25 20:30:33 +0100
commit116a1fa10dd3c5f98fc4d6e8cdcf762fe79df05f (patch)
tree71c29c7fd188da53fa9e44031407f19943b5af7f
parentf0b22b6b045d667ef93f18681c7d2452c4f7c452 (diff)
Try to get the uri s going again.
-rw-r--r--config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java3
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/search/AbstractSearchCluster.java4
2 files changed, 2 insertions, 5 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java
index 0de5b5ac202..ed85b987a3d 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java
@@ -75,8 +75,7 @@ public class PreGeneratedFileRegistry implements FileRegistry {
@Override
public FileReference addUri(String uri) {
- // TODO: uri's should also be pregenerated.
- return null;
+ return new FileReference(path2Hash.get(uri));
}
@Override
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 d77ef26a9e4..9550cd82b22 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
@@ -41,9 +41,7 @@ public abstract class AbstractSearchCluster extends AbstractConfigProducer
FileReference reference = (constant.getPathType() == RankingConstant.PathType.FILE)
? FileSender.sendFileToServices(constant.getFileName(), backends)
: FileSender.sendUriToServices(constant.getUri(), backends);
- if (reference != null) {
- constant.setFileReference(reference.value());
- }
+ constant.setFileReference(reference.value());
}
}
}