diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2013-02-20 17:49:03 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2013-02-20 17:49:03 +0000 |
| commit | 6df47321a59db5d423e37955ff60a36ce7b80f59 (patch) | |
| tree | dec8bcd9e83343f05386e39e67e8f055362ad465 /src | |
| parent | 7ccf5c1d2600f780effd59e5b885f4f7b0fbadfc (diff) | |
| download | rabbitmq-server-git-6df47321a59db5d423e37955ff60a36ce7b80f59.tar.gz | |
eliminate non-linear BQS usage
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 5fd3377ad5..de3e73ee50 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -606,9 +606,10 @@ deliver_or_enqueue(Delivery = #delivery{message = Message, sender = SenderPid}, requeue_and_run(AckTags, State = #q{backing_queue = BQ, backing_queue_state = BQS}) -> + WasEmpty = BQ:is_empty(BQS), {_MsgIds, BQS1} = BQ:requeue(AckTags, BQS), State1 = drop_expired_msgs(State#q{backing_queue_state = BQS1}), - maybe_send_drained(BQ:is_empty(BQS), State1), + maybe_send_drained(WasEmpty, State1), run_message_queue(State1). fetch(AckRequired, State = #q{backing_queue = BQ, |