From 18d3a89d1d6cb36629782a73207c1d8f8e8c6978 Mon Sep 17 00:00:00 2001
From: Francesco Mazzoli <francesco@rabbitmq.com>
Date: Wed, 4 Apr 2012 11:03:22 +0100
Subject: Discarding delivery when detecting DLX cycle.

---
 src/rabbit_amqqueue_process.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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) ->
-- 
cgit v1.2.1