diff options
author | gjoranv <gjoranv@gmail.com> | 2018-12-11 16:55:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-11 16:55:13 +0100 |
commit | 8f9594a7219835c3540b1cc40ec835838b147bbb (patch) | |
tree | 33ebf24837973ea863cd9663d2359e1570a5e1fa /configserver/src/main | |
parent | 478fb8d723cf19e7ed19853b26c6ce932057f58e (diff) | |
parent | 7bce09f5e9a5afdd7156eab4196ea4cbf102cad6 (diff) |
Merge pull request #7924 from vespa-engine/hmusum/avoid-tests-writing-to-module-directory
Refactor to avoid writing test data to module directory
Diffstat (limited to 'configserver/src/main')
2 files changed, 8 insertions, 0 deletions
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 a8159405edd..2a8abacd24e 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 @@ -72,6 +72,10 @@ public class FileDirectory { return files[0]; } + File getRoot() { + return root; + } + private Long computeHash(File file) throws IOException { XXHash64 hasher = XXHashFactory.fastestInstance().hash64(); if (file.isDirectory()) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java index 060f92aa2f4..16aaef048b5 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java @@ -93,6 +93,10 @@ public class FileServer { return hasFile(new FileReference(fileReference)); } + FileDirectory getRootDir() { + return root; + } + private boolean hasFile(FileReference reference) { try { return root.getFile(reference).exists(); |