From: weiqiaomiao <wei.qiaomiao@zte.com.cn>
Date: Thu, 23 Jun 2016 07:49:09 +0000 (+0800)
Subject: rgw: duplicate check for acl op in RGWHandler_REST_Bucket_SWIFT::op_get fuction
X-Git-Tag: v11.0.0~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c0517cde6942d9fe3246b64d2c1a14866587ea88;p=ceph.git

rgw: duplicate check for acl op in RGWHandler_REST_Bucket_SWIFT::op_get fuction

Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
---

diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index 3a3537ba8027..576b4be465dc 100644
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -1388,17 +1388,11 @@ RGWOp *RGWHandler_REST_Bucket_SWIFT::get_obj_op(bool get_data)
 
 RGWOp *RGWHandler_REST_Bucket_SWIFT::op_get()
 {
-  if (is_acl_op()) {
-    return new RGWGetACLs_ObjStore_SWIFT;
-  }
   return get_obj_op(true);
 }
 
 RGWOp *RGWHandler_REST_Bucket_SWIFT::op_head()
 {
-  if (is_acl_op()) {
-    return new RGWGetACLs_ObjStore_SWIFT;
-  }
   return get_obj_op(false);
 }
 
@@ -1438,17 +1432,11 @@ RGWOp *RGWHandler_REST_Obj_SWIFT::get_obj_op(bool get_data)
 
 RGWOp *RGWHandler_REST_Obj_SWIFT::op_get()
 {
-  if (is_acl_op()) {
-    return new RGWGetACLs_ObjStore_SWIFT;
-  }
   return get_obj_op(true);
 }
 
 RGWOp *RGWHandler_REST_Obj_SWIFT::op_head()
 {
-  if (is_acl_op()) {
-    return new RGWGetACLs_ObjStore_SWIFT;
-  }
   return get_obj_op(false);
 }