diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2013-03-01 14:34:35 +0000 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2013-03-01 14:34:35 +0000 |
| commit | f5b54bf297c2a77d5623794f1a65858a39d74453 (patch) | |
| tree | 8a2b997103e83ceac9153af3fa960c4956108e1a | |
| parent | edb5c71eefb44ff97230ecdd89d572b88209b733 (diff) | |
| download | rabbitmq-server-git-f5b54bf297c2a77d5623794f1a65858a39d74453.tar.gz | |
Check queue length using correct version of backing queue state
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 08d68e4c8d..18b641d4f7 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 |