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
commit54ad910e0b6ba58b88ed42da7e7a0802ddafb6ea (patch)
tree364817b4ef88bf5cc921e7143ff83485e42eab7e
parent7f362fed07be9504213e414c228154cb8345c43e (diff)
parent05389d125bb79a6db801cc25647bcaebdbf25c09 (diff)
downloadrabbitmq-server-git-54ad910e0b6ba58b88ed42da7e7a0802ddafb6ea.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 c790a12df7..3e3de10bbe 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},