diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-02-13 11:21:35 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-02-13 11:21:35 +0000 |
| commit | 4281b92a3ee33e668a392faa45b7d8d30be5fb10 (patch) | |
| tree | c6ed1d01bc61b7a68f14f329df4eeace58f01a73 | |
| parent | 214cb62d06a9aca9e1f6531404b403e8552fb5ae (diff) | |
| parent | c1d018841c239e06eb2634a0964555831a79efde (diff) | |
| download | rabbitmq-server-git-4281b92a3ee33e668a392faa45b7d8d30be5fb10.tar.gz | |
stable to default
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 3bae4cfbb1..00a3a85acf 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -470,10 +470,9 @@ deliver_msg_to_consumer(DeliverFun, {Stop, State1}. deliver_from_queue_deliver(AckRequired, State) -> - {Result, State1} = fetch(AckRequired, State), - State2 = #q{backing_queue = BQ, backing_queue_state = BQS} = - drop_expired_msgs(State1), - {Result, BQ:is_empty(BQS), State2}. + {Result, State1 = #q{backing_queue = BQ, backing_queue_state = BQS}} = + fetch(AckRequired, State), + {Result, BQ:is_empty(BQS), State1}. confirm_messages([], State) -> State; @@ -573,7 +572,7 @@ requeue_and_run(AckTags, State = #q{backing_queue = BQ, fetch(AckRequired, State = #q{backing_queue = BQ, backing_queue_state = BQS}) -> {Result, BQS1} = BQ:fetch(AckRequired, BQS), - {Result, State#q{backing_queue_state = BQS1}}. + {Result, drop_expired_msgs(State#q{backing_queue_state = BQS1})}. ack(AckTags, ChPid, State) -> subtract_acks(ChPid, AckTags, State, |