From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 2 Nov 2015 21:00:33 +0000 (-0500)
Subject: rgw: fix for decode of ZoneGroup id
X-Git-Tag: v10.1.0~354^2~205
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9122fab4f33fe9dd647791b81e83f71d077680c0;p=ceph.git

rgw: fix for decode of ZoneGroup id

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_json_enc.cc b/src/rgw/rgw_json_enc.cc
index e4f367938dad..cb108aa59b19 100644
--- a/src/rgw/rgw_json_enc.cc
+++ b/src/rgw/rgw_json_enc.cc
@@ -901,7 +901,7 @@ static void decode_placement_targets(map<string, RGWZoneGroupPlacementTarget>& t
 void RGWZoneGroup::decode_json(JSONObj *obj)
 {
   RGWSystemMetaObj::decode_json(obj);
-  if (!id.empty()) {
+  if (id.empty()) {
     derr << "old format " << dendl;
     JSONDecoder::decode_json("name", name, obj);
     id = name;