diff options
| author | Tim Watson <tim@rabbitmq.com> | 2012-10-15 15:20:05 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2012-10-15 15:20:05 +0100 |
| commit | c35a823847ac2654a073d57edbf825e2012e4a83 (patch) | |
| tree | 30d31fe04b93f7832f24c6c9cfbe5bfd172e3d20 | |
| parent | 90e9462d0e2ebeea41756a621c4bd14ac50f78c9 (diff) | |
| parent | c280fa22b043a39a9bf1ef9a0fd20409b7d4b5ed (diff) | |
| download | rabbitmq-server-git-c35a823847ac2654a073d57edbf825e2012e4a83.tar.gz | |
merge default (again)
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index f4679184a8..9e2901265d 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -639,17 +639,15 @@ maybe_enqueue_message( State1 #state { msg_id_status = dict:erase(MsgId, MS), sender_queues = SQ1 }; {ok, published} -> - {MS1, SQ1} = - case needs_confirming(Delivery, State1) of - never -> {dict:erase(MsgId, MS), - remove_from_pending_ch(MsgId, ChPid, SQ)}; - eventually -> MMS = {published, ChPid, MsgSeqNo}, - {dict:store(MsgId, MMS, MS), SQ}; - immediately -> ok = rabbit_misc:confirm_to_sender( - ChPid, [MsgSeqNo]), - {dict:erase(MsgId, MS), - remove_from_pending_ch(MsgId, ChPid, SQ)} - end, + MS1 = case needs_confirming(Delivery, State1) of + never -> dict:erase(MsgId, MS); + eventually -> MMS = {published, ChPid, MsgSeqNo}, + dict:store(MsgId, MMS, MS); + immediately -> ok = rabbit_misc:confirm_to_sender( + ChPid, [MsgSeqNo]), + dict:erase(MsgId, MS) + end, + SQ1 = remove_from_pending_ch(MsgId, ChPid, SQ), State1 #state { msg_id_status = MS1, sender_queues = SQ1 }; {ok, discarded} -> |