From: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri, 18 Jul 2014 21:52:48 +0000 (-0700)
Subject: rgw: dump prefix unconditionally
X-Git-Tag: v0.80.5~5^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5049fc4c9d6513bc58c3c4464f3de18949ac0aa5;p=ceph.git

rgw: dump prefix unconditionally

As part of issue #8858, and to be more in line with S3, dump the Prefix
field when listing bucket even if bucket is empty.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit d7209c11251d42227608bc54cc69232ef62ffe80)
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 84499b0e43e..c7961f4a9c5 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -251,8 +251,7 @@ void RGWListBucket_ObjStore_S3::send_response()
   s->formatter->open_object_section_in_ns("ListBucketResult",
 					  "http://s3.amazonaws.com/doc/2006-03-01/");
   s->formatter->dump_string("Name", s->bucket_name_str);
-  if (!prefix.empty())
-    s->formatter->dump_string("Prefix", prefix);
+  s->formatter->dump_string("Prefix", prefix);
   s->formatter->dump_string("Marker", marker);
   if (is_truncated && !next_marker.empty())
     s->formatter->dump_string("NextMarker", next_marker);