RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-30 15:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: fix regionmap json decoding

Browse Source 
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
This commit is contained in:
Yehuda Sadeh 2013-06-26 22:39:07 -07:00
parent af00f73348
commit 8f1da8f3d4
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/rgw/rgw_json_enc.cc
View File

@ -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);
}