summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Mazzoli <francesco@rabbitmq.com>2012-04-05 14:05:34 +0100
committerFrancesco Mazzoli <francesco@rabbitmq.com>2012-04-05 14:05:34 +0100
commit2af7361523c33acc503b85f92f5af35a26fd6d7e (patch)
treefeea4ca07a06fd80845c1a758a084866b76aa39e
parent2926a01ac57900cf4a45b438c80e1fd9817c9f3c (diff)
parent18d3a89d1d6cb36629782a73207c1d8f8e8c6978 (diff)
downloadrabbitmq-server-2af7361523c33acc503b85f92f5af35a26fd6d7e.tar.gz
Merged default
-rw-r--r--src/rabbit_amqqueue_process.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 75b92f1f..88a014b5 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -1216,7 +1216,7 @@ handle_cast({deliver, Delivery = #delivery{sender = Sender,
false -> noreply(deliver_or_enqueue(Delivery, State));
Qs -> log_cycle_once(Qs),
rabbit_misc:confirm_to_sender(Sender, [MsgSeqNo]),
- noreply(State)
+ noreply(discard_delivery(Delivery, State))
end;
handle_cast({ack, AckTags, ChPid}, State) ->