aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/runtime
diff options
context:
space:
mode:
authorGravatar ccalvarin <ccalvarin@google.com>2017-09-26 11:13:33 -0400
committerGravatar John Cater <jcater@google.com>2017-09-27 09:58:47 -0400
commitfb3293c3e0fadd655bb7db691040cc9ccd6c0650 (patch)
treee566a6fe63cd6ac0db1ff11fd45751ef72bfd1e4 /src/main/java/com/google/devtools/build/lib/runtime
parentd27ed80762380c0fe9da9fc512c5d40a86acc59f (diff)
Make UnionFileSystem accept all paths Bazel can throw at it.
Instead of relying on a character-by-character StringTrie, segment paths based on PathFragments. This means UnionFS can accept any path that Bazel stores internally, removing the ASCII limitations. This also means removing the ability to have a filesystem bound for sub-PathFragments, /foo/barbar, /foo/barqux could have the same filesystem bound at /foo/bar. This feature was tested for when a use case was envisioned, but it was never used, so removing it is safe. RELNOTES: None. PiperOrigin-RevId: 170054656
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/runtime')
-rw-r--r--src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index b904e1df80..2bbdb48e38 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -808,7 +808,7 @@ public final class BlazeRuntime {
}
}
- private static FileSystem fileSystemImplementation() {
+ private static FileSystem defaultFileSystemImplementation() {
if ("0".equals(System.getProperty("io.bazel.EnableJni"))) {
// Ignore UnixFileSystem, to be used for bootstrapping.
return OS.getCurrent() == OS.WINDOWS ? new WindowsFileSystem() : new JavaIoFileSystem();
@@ -943,7 +943,7 @@ public final class BlazeRuntime {
}
if (fs == null) {
- fs = fileSystemImplementation();
+ fs = defaultFileSystemImplementation();
}
Path.setFileSystemForSerialization(fs);