cosmetics and some minor refactoring

1 files changed, 9 insertions, 10 deletions

diff --git a/src/rabbit_router.erl b/src/rabbit_router.erl
index 707698b0..a1a341a9 100644
--- a/src/rabbit_router.erl
+++ b/src/rabbit_router.erl
@@ -70,16 +70,15 @@ deliver(QPids, Delivery = #delivery{mandatory = false,
       QPids, fun (Pid) -> rabbit_amqqueue:deliver(Pid, Delivery) end),
     {routed, QPids};
 
-deliver(QPids, Delivery) ->
-    {Success, _} =
-        delegate:invoke(QPids,
-                        fun (Pid) ->
-                                rabbit_amqqueue:deliver(Pid, Delivery)
-                        end),
-    {Routed, Handled} =
-        lists:foldl(fun fold_deliveries/2, {false, []}, Success),
-    case check_delivery(Delivery#delivery.mandatory, Delivery#delivery.immediate,
-                        {Routed, Handled}) of
+deliver(QPids, Delivery = #delivery{mandatory = Mandatory,
+                                    immediate = Immediate}) ->
+    {Success, _} = delegate:invoke(
+                     QPids, fun (Pid) ->
+                                    rabbit_amqqueue:deliver(Pid, Delivery)
+                            end),
+    case check_delivery(Mandatory, Immediate,
+                        lists:foldl(fun fold_deliveries/2,
+                                    {false, []}, Success)) of
         {routed, Qs} -> {routed, Qs};
         O            -> O
     end.