diff options
Diffstat (limited to 'jimfs/src/main/java/com/google/common')
-rw-r--r-- | jimfs/src/main/java/com/google/common/jimfs/JimfsPath.java | 6 | ||||
-rw-r--r-- | jimfs/src/main/java/com/google/common/jimfs/PathService.java | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/jimfs/src/main/java/com/google/common/jimfs/JimfsPath.java b/jimfs/src/main/java/com/google/common/jimfs/JimfsPath.java index 7c6b115..9d18837 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/JimfsPath.java +++ b/jimfs/src/main/java/com/google/common/jimfs/JimfsPath.java @@ -251,11 +251,7 @@ final class JimfsPath implements Path { /** Resolves the given name against this path. The name is assumed not to be a root name. */ JimfsPath resolve(Name name) { - if (name.toString().isEmpty()) { - return this; - } - return pathService.createPathInternal( - root, ImmutableList.<Name>builder().addAll(names).add(name).build()); + return resolve(pathService.createFileName(name)); } @Override diff --git a/jimfs/src/main/java/com/google/common/jimfs/PathService.java b/jimfs/src/main/java/com/google/common/jimfs/PathService.java index 49717bd..2bd11a7 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/PathService.java +++ b/jimfs/src/main/java/com/google/common/jimfs/PathService.java @@ -19,7 +19,6 @@ package com.google.common.jimfs; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import static com.google.common.jimfs.PathType.ParseResult; import static java.nio.file.LinkOption.NOFOLLOW_LINKS; import com.google.common.annotations.VisibleForTesting; @@ -31,6 +30,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; +import com.google.common.jimfs.PathType.ParseResult; import java.net.URI; import java.nio.file.FileSystem; import java.nio.file.Files; |