merge stable into default

1 files changed, 6 insertions, 8 deletions

diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 048c4a6dcf..cb59edd9b1 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -536,10 +536,6 @@ deliver_msg_to_consumer0(DeliverFun,
                           unsent_message_count = Count + 1}),
     {Stop, State1}.
 
-deliver_from_queue_deliver(AckRequired, State) ->
-    {Result, State1} = fetch(AckRequired, State),
-    {Result, is_empty(State1), State1}.
-
 update_consumer_use(State = #q{consumer_use = CUInfo}, Use) ->
     State#q{consumer_use = update_consumer_use1(CUInfo, Use)}.
 
@@ -609,10 +605,12 @@ discard(#delivery{sender     = SenderPid,
     State1#q{backing_queue_state = BQS1}.
 
 run_message_queue(State) ->
-    {_Active, State1} = deliver_msgs_to_consumers(
-                          fun deliver_from_queue_deliver/2,
-                          is_empty(State), State),
-    State1.
+    {_Active, State3} = deliver_msgs_to_consumers(
+                          fun(AckRequired, State1) ->
+                                  {Result, State2} = fetch(AckRequired, State1),
+                                  {Result, is_empty(State2), State2}
+                          end, is_empty(State), State),
+    State3.
 
 add_consumer({ChPid, Consumer = #consumer{args = Args}}, ActiveConsumers) ->
     Priority = case rabbit_misc:table_lookup(Args, <<"x-priority">>) of