From: Yehuda Sadeh <yehuda@inktank.com>
Date: Sat, 13 Jul 2013 03:26:06 +0000 (-0700)
Subject: rgw: fix bucket instance json encoding
X-Git-Tag: v0.67-rc1~71^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a722fb713e715004e9b0156f75c392dda1c8f4cd;p=ceph.git

rgw: fix bucket instance json encoding

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 9291b261297b..05d7206ba442 100644
--- a/src/rgw/rgw_json_enc.cc
+++ b/src/rgw/rgw_json_enc.cc
@@ -494,7 +494,7 @@ void RGWBucketInfo::dump(Formatter *f) const
   encode_json("owner", owner, f);
   encode_json("flags", flags, f);
   encode_json("region", region, f);
-  encode_json("placement_rule", region, f);
+  encode_json("placement_rule", placement_rule, f);
   encode_json("has_instance_obj", has_instance_obj, f);
 }
 
@@ -504,7 +504,7 @@ void RGWBucketInfo::decode_json(JSONObj *obj) {
   JSONDecoder::decode_json("owner", owner, obj);
   JSONDecoder::decode_json("flags", flags, obj);
   JSONDecoder::decode_json("region", region, obj);
-  JSONDecoder::decode_json("placement_rule", region, obj);
+  JSONDecoder::decode_json("placement_rule", placement_rule, obj);
   JSONDecoder::decode_json("has_instance_obj", has_instance_obj, obj);
 }