From 3be0660b25e5e732bb8a554c5c1d9e400f359649 Mon Sep 17 00:00:00 2001 From: Reid Draper Date: Tue, 21 Jan 2014 15:44:48 -0600 Subject: [PATCH] Fix further conflicts from #761 --- src/riak_cs_wm_object.erl | 1 - src/riak_cs_wm_object_acl.erl | 3 +-- src/riak_cs_wm_utils.erl | 5 +++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/riak_cs_wm_object.erl b/src/riak_cs_wm_object.erl index f224f0e07..8f32b933d 100644 --- a/src/riak_cs_wm_object.erl +++ b/src/riak_cs_wm_object.erl @@ -307,7 +307,6 @@ accept_body(RD, Ctx=#context{local_context=LocalCtx, riakc_pid=RiakcPid}) -> #key_context{bucket=Bucket, key=Key, - bucket_object=BucketObj, putctype=ContentType, size=Size, get_fsm_pid=GetFsmPid} = LocalCtx, diff --git a/src/riak_cs_wm_object_acl.erl b/src/riak_cs_wm_object_acl.erl index eb61167f5..72e39725a 100644 --- a/src/riak_cs_wm_object_acl.erl +++ b/src/riak_cs_wm_object_acl.erl @@ -166,8 +166,7 @@ produce_body(RD, Ctx=#context{local_context=LocalCtx, accept_body(RD, Ctx=#context{local_context=#key_context{get_fsm_pid=GetFsmPid, manifest=Mfst, key=KeyStr, - bucket=Bucket, - bucket_object=BucketObj}, + bucket=Bucket}, user=User, acl=AclFromHeadersOrDefault, requested_perm='WRITE_ACP', diff --git a/src/riak_cs_wm_utils.erl b/src/riak_cs_wm_utils.erl index af66f8509..08d536bb7 100644 --- a/src/riak_cs_wm_utils.erl +++ b/src/riak_cs_wm_utils.erl @@ -421,12 +421,13 @@ maybe_update_context_with_acl_from_headers(RD, Ctx=#context{user=User}) -> -spec maybe_acl_from_context_and_request(#wm_reqdata{}, #context{}) -> {ok, acl_or_error()} | error. maybe_acl_from_context_and_request(RD, #context{user=User, - bucket=Bucket, + local_context=KeyContext, riakc_pid=RiakcPid}) -> + BucketObj = KeyContext#key_context.bucket_object, case has_acl_header(RD) of true -> Headers = normalize_headers(RD), - BucketOwner = bucket_owner(Bucket, RiakcPid), + BucketOwner = bucket_owner(BucketObj), Owner = {User?RCS_USER.display_name, User?RCS_USER.canonical_id, User?RCS_USER.key_id},