diff options
author | Emile Joubert <emile@rabbitmq.com> | 2013-03-19 12:49:57 +0000 |
---|---|---|
committer | Emile Joubert <emile@rabbitmq.com> | 2013-03-19 12:49:57 +0000 |
commit | f593d0719d3bfcbf61c607a40d8f5a9767bc3836 (patch) | |
tree | c6744b48e60d39e35900eedaa3d10f23bbdd3576 | |
parent | 6376f39c56a7976a98dc0ce5a84658cb748baa3d (diff) | |
download | rabbitmq-server-f593d0719d3bfcbf61c607a40d8f5a9767bc3836.tar.gz |
Cosmetic
-rw-r--r-- | src/rabbit_exchange.erl | 4 | ||||
-rw-r--r-- | src/rabbit_registry.erl | 25 |
2 files changed, 10 insertions, 19 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index d0504591..a4a88661 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -334,11 +334,11 @@ route1(_, _, {[], _, QNames}) -> route1(Delivery, Decorators, {[X = #exchange{type = Type} | WorkList], SeenXs, QNames}) -> ExchangeDests = (type_to_module(Type)):route(X, Delivery), - AlternateDest = process_alternate(X, ExchangeDests), + AlternateDests = process_alternate(X, ExchangeDests), DecorateDests = process_decorators(Delivery, Decorators, X), route1(Delivery, Decorators, lists:foldl(fun process_route/2, {WorkList, SeenXs, QNames}, - AlternateDest ++ DecorateDests ++ ExchangeDests)). + AlternateDests ++ DecorateDests ++ ExchangeDests)). process_alternate(#exchange{arguments = []}, _Results) -> %% optimisation []; diff --git a/src/rabbit_registry.erl b/src/rabbit_registry.erl index db07dcdb..41b82ba5 100644 --- a/src/rabbit_registry.erl +++ b/src/rabbit_registry.erl @@ -95,29 +95,20 @@ internal_unregister(Class, TypeName) -> true = ets:delete(?ETS_NAME, UnregArg), ok. -conditional_register({{exchange_decorator, Type}, ModuleName}) -> +conditional_register({{exchange_decorator, _Type}, ModuleName} = RegArg) -> case erlang:function_exported(ModuleName, route, 2) of - true -> - true = ets:insert(?ETS_NAME, {{exchange_decorator_route, Type}, - ModuleName}), - ok; - false -> - ok + true -> true = ets:insert(?ETS_NAME, RegArg); + false -> ok end; conditional_register(_) -> ok. -conditional_unregister({exchange_decorator, Type}) -> +conditional_unregister({exchange_decorator, Type} = UnregArg) -> case lookup_module(exchange_decorator, Type) of - {ok, ModuleName} -> - case erlang:function_exported(ModuleName, route, 2) of - true -> - true = ets:delete(?ETS_NAME, {exchange_decorator_route, - Type}), - ok; - false -> - ok - end; + {ok, ModName} -> case erlang:function_exported(ModName, route, 2) of + true -> true = ets:delete(?ETS_NAME, UnregArg); + false -> ok + end; {error, not_found} -> ok end; |