Inline exchange/1, multihead publish/7

1 files changed, 9 insertions, 17 deletions

diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl
index 1c78172750..fa7e3a5ac0 100644
--- a/src/rabbit_basic.erl
+++ b/src/rabbit_basic.erl
@@ -162,29 +162,21 @@ publish(Exchange, RoutingKeyBin, Properties, Body) ->
 
 %% Convenience function, for avoiding round-trips in calls across the
 %% erlang distributed network.
-publish(Exchange, RoutingKeyBin, Mandatory, Immediate, Txn, Properties, Body) ->
-    case exchange(Exchange) of
-        X = #exchange{name = XName} ->
-            publish(X, delivery(Mandatory, Immediate, Txn,
-                                message(XName, RoutingKeyBin,
-                                        properties(Properties), Body),
-                                undefined));
-        Err ->
-            Err
+publish(X = #exchange{name = XName}, RKey, Mandatory, Immediate, Txn,
+        Props, Body) ->
+    publish(X, delivery(Mandatory, Immediate, Txn,
+                        message(XName, RKey, properties(Props), Body),
+                        undefined));
+publish(XName, RKey, Mandatory, Immediate, Txn, Props, Body) ->
+    case rabbit_exchange:lookup(XName) of
+        {ok, X} -> publish(X, RKey, Mandatory, Immediate, Txn, Props, Body);
+        Err     -> Err
     end.
 
 publish(X, Delivery) ->
     {RoutingRes, DeliveredQPids} = rabbit_exchange:publish(X, Delivery),
     {ok, RoutingRes, DeliveredQPids}.
 
-exchange(X = #exchange{}) ->
-    X;
-exchange(XName = #resource{kind = exchange}) ->
-    case rabbit_exchange:lookup(XName) of
-        {ok, X} -> X;
-        Err     -> Err
-    end.
-
 is_message_persistent(#content{properties = #'P_basic'{
                                  delivery_mode = Mode}}) ->
     case Mode of