Repository: jclouds Updated Branches: refs/heads/master 39f3a9d1f -> d3d825d3b
Map empty delimiter to null in B2 Follow on to d07c4a215e452c99f5ddae7fe006d801339d96e7. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/d3d825d3 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/d3d825d3 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/d3d825d3 Branch: refs/heads/master Commit: d3d825d3b9a6cd67406286f9e6f0c5d0852db84c Parents: 39f3a9d Author: Andrew Gaul <[email protected]> Authored: Mon Sep 18 00:12:36 2017 -0700 Committer: Andrew Gaul <[email protected]> Committed: Mon Sep 18 00:12:36 2017 -0700 ---------------------------------------------------------------------- .../b2/src/main/java/org/jclouds/b2/blobstore/B2BlobStore.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3d825d3/providers/b2/src/main/java/org/jclouds/b2/blobstore/B2BlobStore.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/main/java/org/jclouds/b2/blobstore/B2BlobStore.java b/providers/b2/src/main/java/org/jclouds/b2/blobstore/B2BlobStore.java index 1ba37a8..677f9c8 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/blobstore/B2BlobStore.java +++ b/providers/b2/src/main/java/org/jclouds/b2/blobstore/B2BlobStore.java @@ -77,6 +77,7 @@ import org.jclouds.io.PayloadSlicer; import org.jclouds.io.payloads.BaseMutableContentMetadata; import com.google.common.base.Preconditions; +import com.google.common.base.Strings; import com.google.common.base.Supplier; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; @@ -191,7 +192,7 @@ public final class B2BlobStore extends BaseBlobStore { Bucket bucket = getBucket(container); ImmutableList.Builder<StorageMetadata> builder = ImmutableList.builder(); - B2ObjectList list = api.getObjectApi().listFileNames(bucket.bucketId(), options.getMarker(), options.getMaxResults(), options.getPrefix(), delimiter); + B2ObjectList list = api.getObjectApi().listFileNames(bucket.bucketId(), options.getMarker(), options.getMaxResults(), options.getPrefix(), Strings.emptyToNull(delimiter)); for (B2ObjectList.Entry entry : list.files()) { if (entry.action() == Action.FOLDER) { builder.add(new StorageMetadataImpl(StorageType.RELATIVE_PATH, null, entry.fileName(), null, null, null, null, entry.uploadTimestamp(), ImmutableMap.<String, String>of(), null));
