summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2019-01-08 12:27:10 +0100
committerJon Bratseth <bratseth@oath.com>2019-01-08 12:27:10 +0100
commit5de7f3963fa02cb33ba3dcdb08b2114d01e93588 (patch)
tree7bd0e81d17ebb7ecfdebd6c6f8fd9645f9e8e03a
parentd8fa611af69b73755b2fae6189c22818e6728863 (diff)
Remove temporary line
-rwxr-xr-xconfig-lib/src/main/java/com/yahoo/config/FileReference.java2
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java1
2 files changed, 1 insertions, 2 deletions
diff --git a/config-lib/src/main/java/com/yahoo/config/FileReference.java b/config-lib/src/main/java/com/yahoo/config/FileReference.java
index 7d455c58b30..3b95c2fbd4c 100755
--- a/config-lib/src/main/java/com/yahoo/config/FileReference.java
+++ b/config-lib/src/main/java/com/yahoo/config/FileReference.java
@@ -44,7 +44,7 @@ public final class FileReference {
}
public static List<String> toValues(Collection<FileReference> references) {
- List<String> ret = new ArrayList<String>();
+ List<String> ret = new ArrayList<>();
for (FileReference r: references) {
ret.add(r.value());
}
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
index d8d510ac469..f710eec27ba 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
@@ -78,7 +78,6 @@ public class FileDirectory {
}
private Long computeHash(File file) throws IOException {
- if (1==1) return 1L;
XXHash64 hasher = XXHashFactory.fastestInstance().hash64();
if (file.isDirectory()) {
return Files.walk(file.toPath(), 100).map(path -> {