merge default into bug21377

1 files changed, 6 insertions, 7 deletions

diff --git a/src/rabbit_router.erl b/src/rabbit_router.erl
index f337eda3..00df1ce1 100644
--- a/src/rabbit_router.erl
+++ b/src/rabbit_router.erl
@@ -114,10 +114,9 @@ check_delivery(_   , true, {_    , []}) -> {not_delivered, []};
 check_delivery(_   , _   , {_    , Qs}) -> {routed, Qs}.
 
 lookup_qpids(QNames) ->
-    lists:foldl(
-      fun (Key, Acc) ->
-              case mnesia:dirty_read({rabbit_queue, Key}) of
-                  [#amqqueue{pid = QPid}] -> [QPid | Acc];
-                  []                      -> Acc
-              end
-      end, [], QNames).
+    lists:foldl(fun (QName, QPids) ->
+                        case mnesia:dirty_read({rabbit_queue, QName}) of
+                            [#amqqueue{pid = QPid}] -> [QPid | QPids];
+                            []                      -> QPids
+                        end
+                end, [], QNames).