diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2014-02-03 01:10:44 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2014-02-03 01:10:44 +0000 |
| commit | 49a3fbf9792c823d8eabf082b4bac7f8b423925f (patch) | |
| tree | 7da8c1a04677e9d482280ba96b59e9228981d0ef | |
| parent | c94d25c225de70e72d29e1d8305b31be2a06363f (diff) | |
| download | rabbitmq-server-git-49a3fbf9792c823d8eabf082b4bac7f8b423925f.tar.gz | |
missed one instance of the switch away from msg_seq_no as confirm indicator
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index db20c387a5..ba00ff4150 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -450,13 +450,13 @@ send_mandatory(#delivery{mandatory = true, msg_seq_no = MsgSeqNo}) -> gen_server2:cast(SenderPid, {mandatory_received, MsgSeqNo}). -discard(#delivery{sender = SenderPid, - msg_seq_no = MsgSeqNo, - message = #basic_message{id = MsgId}}, State) -> +discard(#delivery{confirm = Confirm, + sender = SenderPid, + message = #basic_message{id = MsgId}}, State) -> State1 = #q{backing_queue = BQ, backing_queue_state = BQS} = - case MsgSeqNo of - undefined -> State; - _ -> confirm_messages([MsgId], State) + case Confirm of + true -> confirm_messages([MsgId], State); + false -> State end, BQS1 = BQ:discard(MsgId, SenderPid, BQS), State1#q{backing_queue_state = BQS1}. |