From 27cf257248ea55f8f4bc7851c3956611828bcae2 Mon Sep 17 00:00:00 2001 From: Sylvain Baubeau Date: Fri, 4 Sep 2015 22:51:44 +0200 Subject: [PATCH] rgw: add delimiter to prefix only when path is specified http://tracker.ceph.com/issues/12960 Fixes: #12960 Signed-off-by: Sylvain Baubeau --- src/rgw/rgw_rest_swift.cc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc index bdd5b9b1f2b..de60d6c98fe 100644 --- a/src/rgw/rgw_rest_swift.cc +++ b/src/rgw/rgw_rest_swift.cc @@ -200,13 +200,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; -- 2.47.3