Fix further conflicts from #761

basho · Jan 21, 2014 · 3be0660 · 3be0660
1 parent 06c6b73
commit 3be0660
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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},