summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2013-03-01 14:34:35 +0000
committerEmile Joubert <emile@rabbitmq.com>2013-03-01 14:34:35 +0000
commit9e125a71712752f84550490e357e867206e000a3 (patch)
tree8a2b997103e83ceac9153af3fa960c4956108e1a
parent9a1acf8cb9c863c5f5e46309abec07009224252d (diff)
downloadrabbitmq-server-9e125a71712752f84550490e357e867206e000a3.tar.gz
Check queue length using correct version of backing queue statebug19375
-rw-r--r--src/rabbit_amqqueue_process.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 08d68e4c..18b641d4 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -562,9 +562,9 @@ deliver_or_enqueue(Delivery = #delivery{message = Message, sender = SenderPid},
discard(Delivery, State2);
{false, State2 = #q{backing_queue = BQ, backing_queue_state = BQS}} ->
BQS1 = BQ:publish(Message, Props, Delivered, SenderPid, BQS),
- {Dropped, State3} =
+ {Dropped, State3 = #q{backing_queue_state = BQS2}} =
maybe_drop_head(State2#q{backing_queue_state = BQS1}),
- QLen = BQ:len(BQS1),
+ QLen = BQ:len(BQS2),
%% optimisation: it would be perfectly safe to always
%% invoke drop_expired_msgs here, but that is expensive so
%% we only do that if a new message that might have an