diff options
| author | Rob Harrop <rharrop@vmware.com> | 2010-08-20 14:16:05 +0100 |
|---|---|---|
| committer | Rob Harrop <rharrop@vmware.com> | 2010-08-20 14:16:05 +0100 |
| commit | ace23b69809ca425d17af8e43b7853fefc38324e (patch) | |
| tree | d51ee80ba470c034197fe9b692b9e721a038b598 | |
| parent | 26240d2783ac7ee636c6c4c8531b562fb29762cb (diff) | |
| download | rabbitmq-server-git-ace23b69809ca425d17af8e43b7853fefc38324e.tar.gz | |
support for expiration during consume now
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index b6f898cece..8c0bc8b474 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -406,10 +406,9 @@ deliver_from_queue_pred(IsEmpty, _State) -> deliver_from_queue_deliver(AckRequired, false, State = #q{backing_queue = BQ, backing_queue_state = BQS}) -> - {{Message, _MsgProperties, IsDelivered, AckTag, Remaining}, BQS1} = - BQ:fetch(AckRequired, BQS), - {{Message, IsDelivered, AckTag}, 0 == Remaining, - State #q { backing_queue_state = BQS1 }}. + {{Message, IsDelivered, AckTag, Remaining}, State1} = + fetch(AckRequired, State), + {{Message, IsDelivered, AckTag}, 0 == Remaining, State1}. run_message_queue(State = #q{backing_queue = BQ, backing_queue_state = BQS}) -> Funs = {fun deliver_from_queue_pred/2, |