summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-06-27 15:15:40 +0100
committerSimon MacMullen <simon@rabbitmq.com>2013-06-27 15:15:40 +0100
commitc6f3dcdc04f312051f644200c95d6580e51852b1 (patch)
tree364817b4ef88bf5cc921e7143ff83485e42eab7e
parent7eab72a138850c50c2de92fea248d20488d1a693 (diff)
parenta222f45cb5c56ed51a2f40fa00f99cc5b3b49e90 (diff)
downloadrabbitmq-server-c6f3dcdc04f312051f644200c95d6580e51852b1.tar.gz
Merge bug25624
-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},