Allow empty delimiters with openstack-swift

Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/57dceaf5
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/57dceaf5
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/57dceaf5

Branch: refs/heads/2.0.x
Commit: 57dceaf56f11692de2362029e1d127b0e68419ba
Parents: 4765590
Author: Andrew Gaul <[email protected]>
Authored: Thu Sep 7 12:28:41 2017 -0700
Committer: Andrew Gaul <[email protected]>
Committed: Fri Nov 24 19:25:34 2017 -0800

----------------------------------------------------------------------
 .../swift/v1/blobstore/functions/ToListContainerOptions.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/57dceaf5/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToListContainerOptions.java
----------------------------------------------------------------------
diff --git 
a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToListContainerOptions.java
 
b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToListContainerOptions.java
index 918a992..de06d14 100644
--- 
a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToListContainerOptions.java
+++ 
b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToListContainerOptions.java
@@ -21,6 +21,7 @@ import static 
com.google.common.base.Preconditions.checkNotNull;
 import org.jclouds.blobstore.options.ListContainerOptions;
 
 import com.google.common.base.Function;
+import com.google.common.base.Strings;
 
 public class ToListContainerOptions implements
       Function<ListContainerOptions, 
org.jclouds.openstack.swift.v1.options.ListContainerOptions> {
@@ -45,7 +46,7 @@ public class ToListContainerOptions implements
       } else if (!from.isRecursive()) {
          options.delimiter('/');
       }
-      if (from.getDelimiter() != null) {
+      if (!Strings.isNullOrEmpty(from.getDelimiter())) {
          if (from.getDelimiter().length() != 1) {
             throw new IllegalArgumentException("Delimiter must be a single 
character");
          }

Reply via email to