]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: duplicate check for acl op in RGWHandler_REST_Bucket_SWIFT::op_get fuction 9888/head
authorweiqiaomiao <wei.qiaomiao@zte.com.cn>
Thu, 23 Jun 2016 07:49:09 +0000 (15:49 +0800)
committerweiqiaomiao <wei.qiaomiao@zte.com.cn>
Thu, 23 Jun 2016 07:49:09 +0000 (15:49 +0800)
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
src/rgw/rgw_rest_swift.cc

index 3a3537ba8027675eb26c79d388a0f3aaf619796c..576b4be465dc824c139b7ba2212fb2c92f51017f 100644 (file)
@@ -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);
 }