diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2013-03-25 11:12:54 +0000 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2013-03-25 11:12:54 +0000 |
| commit | 087f9bf2e5a06be7253d410b05439d3a19e36356 (patch) | |
| tree | 481e3dafca904a43bc1b896c91b146918526aa12 | |
| parent | 6fa8df03f5de1bfcdef7ec9beeebdbe0b910aee2 (diff) | |
| download | rabbitmq-server-git-087f9bf2e5a06be7253d410b05439d3a19e36356.tar.gz | |
Cosmetic
| -rw-r--r-- | src/rabbit_exchange.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_exchange_decorator.erl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 16cfa8e36f..aa697f076a 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -325,11 +325,11 @@ route1(_, _, {[], _, QNames}) -> route1(Delivery, RDecorators, {[X = #exchange{type = Type} | WorkList], SeenXs, QNames}) -> ExchangeDests = (type_to_module(Type)):route(X, Delivery), - DecorateDests = process_decorators(X, RDecorators, Delivery), + RDecorateDests = process_decorators(X, RDecorators, Delivery), AlternateDests = process_alternate(X, ExchangeDests), route1(Delivery, RDecorators, lists:foldl(fun process_route/2, {WorkList, SeenXs, QNames}, - AlternateDests ++ DecorateDests ++ ExchangeDests)). + AlternateDests ++ RDecorateDests ++ ExchangeDests)). process_alternate(#exchange{arguments = []}, _Results) -> %% optimisation []; diff --git a/src/rabbit_exchange_decorator.erl b/src/rabbit_exchange_decorator.erl index 240ddd9afc..cdbc42bb6e 100644 --- a/src/rabbit_exchange_decorator.erl +++ b/src/rabbit_exchange_decorator.erl @@ -94,7 +94,7 @@ record(X, Decorators) -> Callbacks = D:active_for(X), {cons_if_eq(all, Callbacks, D, Route), cons_if_eq(noroute, Callbacks, D, NoRoute)} - end, {[], []}, Decorators)}. + end, {[], []}, Decorators)}. cons_if_eq(Select, Select, Item, List) -> [Item | List]; cons_if_eq(_Select, _Other, _Item, List) -> List. |