summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@inktank.com>2013-02-07 14:40:11 -0800
committerYehuda Sadeh <yehuda@inktank.com>2013-02-07 14:54:54 -0800
commitf6af1e76a8847b105016b2d8f78a3508e838adbe (patch)
tree1d1ef4e3376880bd3268145d52a53518600a0047
parente345dfe04a64fcd0d37c9e0717b6714038c302ae (diff)
downloadceph-f6af1e76a8847b105016b2d8f78a3508e838adbe.tar.gz
rgw: fix bucket_owner assignment
s->bucket_acl may be null, so reverting to old behavior. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
-rw-r--r--src/rgw/rgw_log.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rgw/rgw_log.cc b/src/rgw/rgw_log.cc
index 474d83e421e..57f73129f29 100644
--- a/src/rgw/rgw_log.cc
+++ b/src/rgw/rgw_log.cc
@@ -304,7 +304,7 @@ int rgw_log_op(RGWRados *store, struct req_state *s, const string& op_name, OpsL
entry.user = s->user.user_id;
if (s->object_acl)
entry.object_owner = s->object_acl->get_owner().get_id();
- entry.bucket_owner = s->bucket_acl->get_owner().get_id();
+ entry.bucket_owner = s->bucket_owner.get_id();
uint64_t bytes_sent = s->cio->get_bytes_sent();