From: lu.shasha <lu.shasha@eisoo.com>
Date: Fri, 8 Sep 2017 05:53:20 +0000 (+0800)
Subject: rgw: list_bucket versions return NextVersionIdMarker = "null" if next_marker.instance... 
X-Git-Tag: v15.1.0~2847^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ba853f39fb18062db2865664b07355210b9a7c2;p=ceph.git

rgw: list_bucket versions return NextVersionIdMarker = "null" if next_marker.instance is empty

Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 024ac4a0229..f408c2bcf11 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -684,7 +684,10 @@ void RGWListBucket_ObjStore_S3::send_versioned_response()
   s->formatter->dump_string("VersionIdMarker", marker.instance);
   if (is_truncated && !next_marker.empty()) {
     s->formatter->dump_string("NextKeyMarker", next_marker.name);
-    s->formatter->dump_string("NextVersionIdMarker", next_marker.instance);
+    if (next_marker.instance.empty())
+      s->formatter->dump_string("NextVersionIdMarker", "null");  
+    else
+      s->formatter->dump_string("NextVersionIdMarker", next_marker.instance);
   }
   s->formatter->dump_int("MaxKeys", max);
   if (!delimiter.empty())