From 0a3df98df63232b82d33eb886795e40b7fa39e6c Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Mon, 27 Oct 2014 13:50:46 -0700 Subject: [PATCH] rgw: send "null" version id if needed on bucket list versions Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_rest_s3.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index 804e7bb590b7c..05575c20a17f1 100644 --- 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()) { -- 2.39.5