summaryrefslogtreecommitdiff
path: root/src
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
commit05389d125bb79a6db801cc25647bcaebdbf25c09 (patch)
tree2471c19ddec253a24a6746ae603283ba9ef06830 /src
parent51fe2d5a17ac6ce3828734b651f870743ac8a26f (diff)
downloadrabbitmq-server-git-05389d125bb79a6db801cc25647bcaebdbf25c09.tar.gz
Discard previously-discarded messages correctly
Diffstat (limited to 'src')
-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},