Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Map empty delimiter to null in B2 

Follow on to d07c4a215e.
This commit is contained in:
Andrew Gaul 2017-09-18 00:12:36 -07:00
parent 39f3a9d1fe
commit d3d825d3b9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
providers/b2/src/main/java/org/jclouds/b2/blobstore/B2BlobStore.java
View File

@ -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));