You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2015/02/21 08:30:25 UTC
jclouds git commit: fix non-recursive list with empty prefix
Repository: jclouds
Updated Branches:
refs/heads/master 7c9d6f762 -> be7b9f4cc
fix non-recursive list with empty prefix
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/be7b9f4c
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/be7b9f4c
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/be7b9f4c
Branch: refs/heads/master
Commit: be7b9f4cc4e42f1f2e54b7364289839f1b5c64c7
Parents: 7c9d6f7
Author: Ka-Hing Cheung <kh...@hxbc.us>
Authored: Fri Feb 20 19:11:03 2015 -0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Fri Feb 20 23:29:48 2015 -0800
----------------------------------------------------------------------
.../jclouds/filesystem/FilesystemBlobStoreTest.java | 15 +++++++++++++++
.../org/jclouds/blobstore/config/LocalBlobStore.java | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/be7b9f4c/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemBlobStoreTest.java
----------------------------------------------------------------------
diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemBlobStoreTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemBlobStoreTest.java
index a5cff21..8b9849b 100644
--- a/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemBlobStoreTest.java
+++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemBlobStoreTest.java
@@ -174,6 +174,21 @@ public class FilesystemBlobStoreTest {
checkForContainerContent(CONTAINER_NAME, blobsExpected);
}
+ @Test
+ public void testList_RootNonRecursive() throws IOException {
+ blobStore.createContainerInLocation(null, CONTAINER_NAME);
+ // Testing list for an empty container
+ checkForContainerContent(CONTAINER_NAME, null);
+
+ TestUtils.createBlobsInContainer(CONTAINER_NAME, "a");
+ ListContainerOptions options = ListContainerOptions.Builder
+ .withDetails()
+ .inDirectory("");
+ PageSet<? extends StorageMetadata> res = blobStore.list(CONTAINER_NAME, options);
+ assertTrue(res.size() == 1);
+ assertEquals(res.iterator().next().getName(), "a");
+ }
+
public void testList_NotExistingContainer() {
// Testing list for a not existing container
try {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/be7b9f4c/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 c7e658e..0d336a6 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
@@ -408,7 +408,7 @@ public final class LocalBlobStore implements BlobStore {
}
public boolean apply(StorageMetadata metadata) {
- if (prefix == null)
+ if (prefix == null || prefix.isEmpty())
return metadata.getName().indexOf(delimiter) == -1;
// ensure we don't accidentally append twice
String toMatch = prefix.endsWith("/") ? prefix : prefix + delimiter;