summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-10-08 03:33:11 +0100
committerMatthias Radestock <matthias@lshift.net>2009-10-08 03:33:11 +0100
commit9dea28e72e4ea0857a3da23a31a34efc012d87e6 (patch)
tree75cd09ff7c77321f8ac007f93842c88a1c250252 /src
parentbfb9afede0a4393a47664de78f42321e0b01ba76 (diff)
downloadrabbitmq-server-git-9dea28e72e4ea0857a3da23a31a34efc012d87e6.tar.gz
cosmetic
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_disk_queue.erl13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/rabbit_disk_queue.erl b/src/rabbit_disk_queue.erl
index 893fae8e5c..42c4ed8bf5 100644
--- a/src/rabbit_disk_queue.erl
+++ b/src/rabbit_disk_queue.erl
@@ -408,11 +408,9 @@ finalise_commit({Q, From},
rabbit_misc:execute_mnesia_transaction(
fun() ->
ok = mnesia:write_lock_table(rabbit_disk_queue),
- {ok, WriteSeqId1} =
- lists:foldl(
- fun ({MsgId, IsDelivered, IsPersistent},
- {ok, SeqId}) ->
- {mnesia:write(
+ lists:foldl(
+ fun ({MsgId, IsDelivered, IsPersistent}, SeqId) ->
+ ok = mnesia:write(
rabbit_disk_queue,
#dq_msg_loc {
queue_and_seq_id = {Q, SeqId},
@@ -420,9 +418,8 @@ finalise_commit({Q, From},
is_delivered = IsDelivered,
is_persistent = IsPersistent
}, write),
- SeqId + 1}
- end, {ok, InitWriteSeqId}, PubMsgIds),
- WriteSeqId1
+ SeqId + 1
+ end, InitWriteSeqId, PubMsgIds)
end),
{ok, State1} = remove_messages(Q, AckSeqIds, State),
true = case PubMsgIds of