summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Mazzoli <francesco@rabbitmq.com>2012-04-04 11:03:22 +0100
committerFrancesco Mazzoli <francesco@rabbitmq.com>2012-04-04 11:03:22 +0100
commit18d3a89d1d6cb36629782a73207c1d8f8e8c6978 (patch)
tree759c0c55b309211a74a362e75eff2ae69c82371d
parent3d63f46b4f94c777a76e62fe951e4b2c96d0c24e (diff)
downloadrabbitmq-server-18d3a89d1d6cb36629782a73207c1d8f8e8c6978.tar.gz
Discarding delivery when detecting DLX cycle.
-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 7c1e4573..4fc95d91 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) ->