From 89a35afd50c74a738ed160eae03d8f6384af6834 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 8 Jan 2019 10:26:06 +0100 Subject: Include queryProfile as a regular parameter --- .../com/yahoo/vespa/config/server/filedistribution/FileDirectory.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configserver') 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 2a8abacd24e..d8d510ac469 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 @@ -23,6 +23,7 @@ import java.nio.file.attribute.BasicFileAttributes; import java.util.logging.Logger; public class FileDirectory { + private static final Logger log = Logger.getLogger(FileDirectory.class.getName()); private final File root; @@ -77,6 +78,7 @@ 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 -> { -- cgit v1.2.3 From 5de7f3963fa02cb33ba3dcdb08b2114d01e93588 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 8 Jan 2019 12:27:10 +0100 Subject: Remove temporary line --- config-lib/src/main/java/com/yahoo/config/FileReference.java | 2 +- .../com/yahoo/vespa/config/server/filedistribution/FileDirectory.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'configserver') 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 toValues(Collection references) { - List ret = new ArrayList(); + List 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 -> { -- cgit v1.2.3