From: Yehuda Sadeh <yehuda@inktank.com>
Date: Thu, 27 Jun 2013 05:39:07 +0000 (-0700)
Subject: rgw: fix regionmap json decoding
X-Git-Tag: v0.67-rc1~128^2~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8f1da8f3d4cd938d7590d2f76db17b2a582e0cf1;p=ceph.git

rgw: fix regionmap json decoding

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

diff --git a/src/rgw/rgw_json_enc.cc b/src/rgw/rgw_json_enc.cc
index 78dd6f10c87..fb077f9aa8c 100644
--- a/src/rgw/rgw_json_enc.cc
+++ b/src/rgw/rgw_json_enc.cc
@@ -642,16 +642,9 @@ void RGWRegionMap::dump(Formatter *f) const
   encode_json("master_region", master_region, f);
 }
 
-static void decode_regions(map<string, RGWRegion>& regions, JSONObj *o)
-{
-  RGWRegion r;
-  r.decode_json(o);
-  regions[r.name] = r;
-}
-
-
 void RGWRegionMap::decode_json(JSONObj *obj)
 {
-  JSONDecoder::decode_json("regions", regions, decode_regions, obj);
+  JSONDecoder::decode_json("regions", regions, obj);
+  JSONDecoder::decode_json("master_region", master_region, obj);
 }