summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2014-02-03 01:10:44 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2014-02-03 01:10:44 +0000
commit7fbbc29999f9e6173ac630aed5deb3c43192c26a (patch)
tree7da8c1a04677e9d482280ba96b59e9228981d0ef
parent38aba3298a9598ebde600347c0e9b5df5f2c6b4f (diff)
downloadrabbitmq-server-7fbbc29999f9e6173ac630aed5deb3c43192c26a.tar.gz
missed one instance of the switch away from msg_seq_no as confirm indicator
-rw-r--r--src/rabbit_amqqueue_process.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index db20c387..ba00ff41 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}.