summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2013-06-26 12:34:16 +0100
committerEmile Joubert <emile@rabbitmq.com>2013-06-26 12:34:16 +0100
commita222f45cb5c56ed51a2f40fa00f99cc5b3b49e90 (patch)
tree2471c19ddec253a24a6746ae603283ba9ef06830
parentb1eb07923baf6892b542a6a7448a71022ddcdf9f (diff)
downloadrabbitmq-server-bug25624.tar.gz
Discard previously-discarded messages correctlybug25624
-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 c790a12d..3e3de10b 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -551,7 +551,7 @@ attempt_delivery(Delivery = #delivery{sender = SenderPid, message = Message},
{published, BQS1} ->
{true, State#q{backing_queue_state = BQS1}};
{discarded, BQS1} ->
- {false, State#q{backing_queue_state = BQS1}}
+ {true, discard(Delivery, State#q{backing_queue_state = BQS1})}
end.
deliver_or_enqueue(Delivery = #delivery{message = Message, sender = SenderPid},