summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2011-10-21 18:30:24 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2011-10-21 18:30:24 +0100
commitd532140b40aa0a61a6c045c8f428942719452b09 (patch)
treea8d2a0a8a411e63dede25197bc3d3bce7a847131
parente0e552ba67fd8989f4398346732aa94d7db89945 (diff)
downloadrabbitmq-server-git-d532140b40aa0a61a6c045c8f428942719452b09.tar.gz
expand scope of "no alternate exchange" optimisation
to cover the "routed somewhere" case too
-rw-r--r--src/rabbit_exchange.erl5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index e1e7245f2d..a15b9be490 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -257,9 +257,8 @@ route1(Delivery, {WorkList, SeenXs, QNames}) ->
DstNames))
end.
-%% Optimisation
-process_alternate(#exchange{arguments = []}, []) -> [];
-
+process_alternate(#exchange{arguments = []}, Results) -> %% optimisation
+ Results;
process_alternate(#exchange{name = XName, arguments = Args}, []) ->
case rabbit_misc:r_arg(XName, exchange, Args, <<"alternate-exchange">>) of
undefined -> [];