rgw: send "null" version id if needed

on bucket list versions

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 804e7bb590b7c1e9bf21e5bf5b470204865e35dd..05575c20a17f10e6b257b5edaac0a29d9c331c65 100644 (file)
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -268,7 +268,11 @@ void RGWListBucket_ObjStore_S3::send_versioned_response()
       const char *section_name = (iter->is_delete_marker() ? "DeleteMarker" : "Version");
       s->formatter->open_array_section(section_name);
       s->formatter->dump_string("Key", iter->key.name);
-      s->formatter->dump_string("VersionId", iter->key.instance);
+      string version_id = iter->key.instance;
+      if (version_id.empty()) {
+        version_id = "null";
+      }
+      s->formatter->dump_string("VersionId", version_id);
       s->formatter->dump_bool("IsLatest", iter->is_current());
       dump_time(s, "LastModified", &mtime);
       if (!iter->is_delete_marker()) {