Cosmetic

2 files changed, 10 insertions, 19 deletions

diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index d050459138..a4a88661a2 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 db07dcdbb4..41b82ba5dc 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;