From: Sylvain Baubeau <sbaubeau@redhat.com>
Date: Fri, 4 Sep 2015 20:51:44 +0000 (+0200)
Subject: rgw: add delimiter to prefix only when path is specified
X-Git-Tag: v0.94.4~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5860%2Fhead;p=ceph.git

rgw: add delimiter to prefix only when path is specified

http://tracker.ceph.com/issues/12960
Fixes: #12960

Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
(cherry picked from commit 27cf257248ea55f8f4bc7851c3956611828bcae2)
---

diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index 9513cd612862..29d1e4680557 100644
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -120,13 +120,14 @@ int RGWListBucket_ObjStore_SWIFT::get_params()
     path = prefix;
     if (path.size() && path[path.size() - 1] != '/')
       path.append("/");
-  }
 
-  int len = prefix.size();
-  int delim_size = delimiter.size();
-  if (len >= delim_size) {
-    if (prefix.substr(len - delim_size).compare(delimiter) != 0)
-      prefix.append(delimiter);
+    int len = prefix.size();
+    int delim_size = delimiter.size();
+
+    if (len >= delim_size) {
+      if (prefix.substr(len - delim_size).compare(delimiter) != 0)
+        prefix.append(delimiter);
+    }
   }
 
   return 0;