diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-11-22 11:24:25 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-11-22 11:24:25 +0000 |
| commit | 477e71bbddbd6d146d285519b0d3fe54b0ceb4a3 (patch) | |
| tree | aa4f22d9aafe7bad32ca6e81cb60a17064834a10 | |
| parent | bb7e0241a18e38c78b305f22483480b2c15dd69b (diff) | |
| parent | 958d777ffbdd5cd534496b91ab5911852abaa37f (diff) | |
| download | rabbitmq-server-git-477e71bbddbd6d146d285519b0d3fe54b0ceb4a3.tar.gz | |
merge bug25301 into stable
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index f87f57777e..68bd1c6c26 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -485,9 +485,11 @@ deliver_msg_to_consumer(DeliverFun, {Stop, State1}. deliver_from_queue_deliver(AckRequired, State) -> - {{Message, IsDelivered, AckTag, Remaining}, State1} = + {{Message, IsDelivered, AckTag, _Remaining}, State1} = fetch(AckRequired, State), - {{Message, IsDelivered, AckTag}, 0 == Remaining, State1}. + State2 = #q{backing_queue = BQ, backing_queue_state = BQS} = + drop_expired_messages(State1), + {{Message, IsDelivered, AckTag}, BQ:is_empty(BQS), State2}. confirm_messages([], State) -> State; |