diff options
| author | Alvaro Videla <videlalvaro@gmail.com> | 2015-09-07 19:05:54 +0200 |
|---|---|---|
| committer | Alvaro Videla <videlalvaro@gmail.com> | 2015-09-07 19:05:54 +0200 |
| commit | e0a30b48000abac998df455f416e8003aa0e2bd4 (patch) | |
| tree | 1fd328c8953576230076ad1d98d3d026e627ea67 | |
| parent | 8d9206d245af44af270ce3b5d50f694fa4c30ef6 (diff) | |
| download | rabbitmq-server-git-e0a30b48000abac998df455f416e8003aa0e2bd4.tar.gz | |
inline qi_deliver_and_ack fun
| -rw-r--r-- | src/rabbit_variable_queue.erl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index af91785b4a..a3b0ee720b 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -1397,7 +1397,9 @@ remove_queue_entries1( process_delivers_and_acks_fun(deliver_and_ack) -> fun (Delivers, Acks, State = #vqstate { index_state = IndexState }) -> - IndexState1 = qi_deliver_and_ack(Delivers, Acks, IndexState), + IndexState1 = + rabbit_queue_index:ack( + Acks, rabbit_queue_index:deliver(Delivers, IndexState)), State #vqstate { index_state = IndexState1 } end; process_delivers_and_acks_fun(_) -> @@ -1405,10 +1407,6 @@ process_delivers_and_acks_fun(_) -> State end. -qi_deliver_and_ack(Delivers, Acks, IndexState) -> - rabbit_queue_index:ack( - Acks, rabbit_queue_index:deliver(Delivers, IndexState)). - %%---------------------------------------------------------------------------- %% Internal gubbins for publishing %%---------------------------------------------------------------------------- |