diff options
author | Matthias Radestock <matthias@rabbitmq.com> | 2011-10-21 19:01:30 +0100 |
---|---|---|
committer | Matthias Radestock <matthias@rabbitmq.com> | 2011-10-21 19:01:30 +0100 |
commit | 3236fdcbfeda09f3e47b56ab07363a0f0fddba4f (patch) | |
tree | e74db75ebec41579c23e537899a6f775ce9ea802 | |
parent | d6d6eccdd2776a4d2cf6fbfc997c1523cd4ff665 (diff) | |
parent | d5d503aae208a607ad60a0187f162d2f33c28aec (diff) | |
download | rabbitmq-server-3236fdcbfeda09f3e47b56ab07363a0f0fddba4f.tar.gz |
merge bug24504 into default
-rw-r--r-- | src/rabbit_exchange.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index afa48355..a15b9be4 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -257,6 +257,8 @@ route1(Delivery, {WorkList, SeenXs, QNames}) -> DstNames)) end. +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 -> []; @@ -355,5 +357,9 @@ peek_serial(XName) -> %% Used with atoms from records; e.g., the type is expected to exist. type_to_module(T) -> - {ok, Module} = rabbit_registry:lookup_module(exchange, T), - Module. + case get({xtype_to_module, T}) of + undefined -> {ok, Module} = rabbit_registry:lookup_module(exchange, T), + put({xtype_to_module, T}, Module), + Module; + Module -> Module + end. |