From: Yehuda Sadeh <yehuda@inktank.com>
Date: Sat, 7 Sep 2013 05:33:38 +0000 (-0700)
Subject: rgw: fix get cors, delete cors
X-Git-Tag: v0.69~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=13872785aeeddbe1b8dd97e49fd6a2d879514f8d;p=ceph.git

rgw: fix get cors, delete cors

Remove a couple of variables that overrode class member. Not
really clear how it was working before, might have been a bad
merge / rebase.

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

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index b5ed3e7fd6fd..114b8709a223 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -1994,7 +1994,6 @@ int RGWDeleteCORS::verify_permission()
 
 void RGWDeleteCORS::execute()
 {
-  RGWCORSConfiguration bucket_cors;
   ret = read_bucket_cors();
   if (ret < 0)
     return;
diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
index 241584bac68e..948a11830c2c 100644
--- a/src/rgw/rgw_op.h
+++ b/src/rgw/rgw_op.h
@@ -531,7 +531,6 @@ public:
 class RGWGetCORS : public RGWOp {
 protected:
   int ret;
-  RGWCORSConfiguration bucket_cors;
 
 public:
   RGWGetCORS() : ret(0) {}