Repository: jclouds Updated Branches: refs/heads/master 34733e991 -> ca58f627d
Fixes a problem on windows where the separator is different Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/ca58f627 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/ca58f627 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/ca58f627 Branch: refs/heads/master Commit: ca58f627d9b0baa9a8839339e362ea4db9d1f30c Parents: 34733e9 Author: Zack Shoylev <[email protected]> Authored: Fri Jan 23 18:12:27 2015 -0600 Committer: Zack Shoylev <[email protected]> Committed: Mon Jan 26 13:52:30 2015 -0600 ---------------------------------------------------------------------- .../main/java/org/jclouds/blobstore/config/LocalBlobStore.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/ca58f627/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java ---------------------------------------------------------------------- diff --git a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java index 5f3c6c1..898aa37 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java @@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Throwables.getCausalChain; import static com.google.common.base.Throwables.propagate; -import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.size; import static com.google.common.collect.Iterables.transform; import static com.google.common.collect.Iterables.tryFind; @@ -29,7 +28,6 @@ import static com.google.common.collect.Sets.newTreeSet; import static org.jclouds.blobstore.options.ListContainerOptions.Builder.recursive; import java.io.ByteArrayOutputStream; -import java.io.File; import java.io.IOException; import java.util.Date; import java.util.Set; @@ -236,9 +234,9 @@ public final class LocalBlobStore implements BlobStore { if (options != null) { final String prefix = options.getDir(); if (prefix != null && !prefix.isEmpty()) { - final String dirPrefix = prefix.endsWith(File.separator) ? + final String dirPrefix = prefix.endsWith("/") ? prefix : - prefix + File.separator; + prefix + "/"; contents = newTreeSet(filter(contents, new Predicate<StorageMetadata>() { public boolean apply(StorageMetadata o) { return o != null && o.getName().startsWith(dirPrefix) && !o.getName().equals(dirPrefix);
