diff options
| -rw-r--r-- | src/rabbit_exchange.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_policy.erl | 16 |
2 files changed, 9 insertions, 12 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index c924f53ad2..6d111b8316 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -133,9 +133,8 @@ policy_changed(X = #exchange{type = XType, ok. serialise_events(X = #exchange{type = Type, decorators = Decorators}) -> - lists:any(fun (M) -> - M:serialise_events(X) - end, rabbit_exchange_decorator:select(all, Decorators)) + lists:any(fun (M) -> M:serialise_events(X) end, + rabbit_exchange_decorator:select(all, Decorators)) orelse (type_to_module(Type)):serialise_events(). serial(#exchange{name = XName} = X) -> diff --git a/src/rabbit_policy.erl b/src/rabbit_policy.erl index d276c2fb27..ad2949b8c7 100644 --- a/src/rabbit_policy.erl +++ b/src/rabbit_policy.erl @@ -170,15 +170,13 @@ update_policies(VHost) -> update_exchange(X = #exchange{name = XName, policy = OldPolicy}, Policies) -> case match(XName, Policies) of - OldPolicy -> - no_change; - NewPolicy -> - rabbit_exchange:update( - XName, fun(X1) -> - rabbit_exchange_decorator:set( - X1#exchange{policy = NewPolicy}) - end), - {X, X#exchange{policy = NewPolicy}} + OldPolicy -> no_change; + NewPolicy -> rabbit_exchange:update( + XName, fun(X1) -> + rabbit_exchange_decorator:set( + X1#exchange{policy = NewPolicy}) + end), + {X, X#exchange{policy = NewPolicy}} end. update_queue(Q = #amqqueue{name = QName, policy = OldPolicy}, Policies) -> |