From: Yehuda Sadeh <yehuda@inktank.com>
Date: Sat, 23 Feb 2013 00:19:37 +0000 (-0800)
Subject: rgw: fix json decoding of rgw_bucket
X-Git-Tag: v0.67-rc1~128^2~200
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8bab4fe04313cfcf024f4c9e5490983fa144e009;p=ceph.git

rgw: fix json decoding of rgw_bucket

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

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 0c157c561fb5..bc3b5810ac8a 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -851,7 +851,6 @@ void RGWCreateBucket::execute()
 
   s->bucket_owner.set_id(s->user.user_id);
   s->bucket_owner.set_name(s->user.display_name);
-
   r = get_policy_from_attr(s->cct, store, s->obj_ctx, &old_policy, obj);
   if (r >= 0)  {
     if (old_policy.get_owner().get_id().compare(s->user.user_id) != 0) {
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 1de333e7f57a..404176fc89db 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -145,7 +145,7 @@ int RGWRegion::init(CephContext *_cct, RGWRados *_store, bool setup_region)
 
   string region_name = cct->_conf->rgw_region;
 
-  if (name.empty()) {
+  if (region_name.empty()) {
     RGWDefaultRegionInfo default_info;
     int r = read_default(default_info);
     if (r == -ENOENT) {
@@ -159,10 +159,10 @@ int RGWRegion::init(CephContext *_cct, RGWRados *_store, bool setup_region)
       lderr(cct) << "failed reading default region info: " << cpp_strerror(-r) << dendl;
       return r;
     }
-    string region_name = default_info.default_region;
+    region_name = default_info.default_region;
   }
 
-  return read_info(name);
+  return read_info(region_name);
 }
 
 int RGWRegion::read_info(const string& region_name)
@@ -1148,7 +1148,6 @@ int RGWRados::create_bucket(string& owner, rgw_bucket& bucket,
 			    bool exclusive)
 {
   int ret = 0;
-
   ret = select_bucket_placement(bucket.name, bucket);
   if (ret < 0)
     return ret;