summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-06-27 15:15:51 +0100
committerSimon MacMullen <simon@rabbitmq.com>2013-06-27 15:15:51 +0100
commiteb632e5abcec20c51710fc8ea739d304fe473f36 (patch)
tree170bfee714529711ce2e490f98ed19aba596c2ea /src
parent2398b25282e9a8516b074c8ca322d5b7600311e3 (diff)
parent54ad910e0b6ba58b88ed42da7e7a0802ddafb6ea (diff)
downloadrabbitmq-server-git-eb632e5abcec20c51710fc8ea739d304fe473f36.tar.gz
stable to default
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},