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

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 024ac4a0229f5379928fac36ec15ddfd7dc0f03d..f408c2bcf1126361ddff114ba6544ddeeed77dbc 100644 (file)
--- 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())