From d5d503aae208a607ad60a0187f162d2f33c28aec Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias@rabbitmq.com>
Date: Fri, 21 Oct 2011 18:30:24 +0100
Subject: expand scope of "no alternate exchange" optimisation to cover the
 "routed somewhere" case too

---
 src/rabbit_exchange.erl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index e1e7245f..a15b9be4 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 -> [];
-- 
cgit v1.2.1