From 841a18489899a1e8a09d602bde11a45e8068f312 Mon Sep 17 00:00:00 2001 From: Timur Alperovich Date: Tue, 7 Jul 2015 16:20:51 -0700 Subject: [PATCH] Azure Blob: do not filter out prefixes. We should not filter out prefixes when listing containers, similarly to the way swift behaves. This makes the marker blobs apparently to the user. --- .../functions/ListBlobsResponseToResourceList.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ListBlobsResponseToResourceList.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ListBlobsResponseToResourceList.java index 6b451dd04f..7daf02232c 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ListBlobsResponseToResourceList.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ListBlobsResponseToResourceList.java @@ -25,7 +25,6 @@ import javax.inject.Singleton; import org.jclouds.azureblob.domain.ListBlobsResponse; import org.jclouds.blobstore.domain.PageSet; import org.jclouds.blobstore.domain.StorageMetadata; -import org.jclouds.blobstore.domain.StorageType; import org.jclouds.blobstore.domain.internal.PageSetImpl; import org.jclouds.blobstore.functions.PrefixToResourceMetadata; @@ -61,10 +60,7 @@ public class ListBlobsResponseToResourceList implements Map nameToMd = Maps.uniqueIndex(contents, indexer); for (String prefix : from.getBlobPrefixes()) { - prefix = prefix.endsWith("/") ? prefix.substring(0, prefix.lastIndexOf('/')) : prefix; - if (!nameToMd.containsKey(prefix) - || nameToMd.get(prefix).getType() != StorageType.RELATIVE_PATH) - contents.add(prefix2ResourceMd.apply(prefix)); + contents.add(prefix2ResourceMd.apply(prefix)); } return new PageSetImpl(contents, from.getNextMarker()); }