diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2013-04-17 08:17:53 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2013-04-17 08:17:53 +0100 |
| commit | e9e634e40fc21fb53a69c69038a78c62b743f379 (patch) | |
| tree | 4f37b33ce2ec30c1be19a2dcd641a7d5d0bcc72a | |
| parent | 074fdf03ac7b9245d150cc03aa89c403001d8526 (diff) | |
| download | rabbitmq-server-e9e634e40fc21fb53a69c69038a78c62b743f379.tar.gz | |
Change exchange update return type
| -rw-r--r-- | src/rabbit_exchange.erl | 7 | ||||
| -rw-r--r-- | src/rabbit_policy.erl | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index a1759c08..1bed9344 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -69,8 +69,7 @@ -spec(update/2 :: (name(), fun((rabbit_types:exchange()) -> rabbit_types:exchange())) - -> {exchange_not_found, rabbit_exchange:name()} | - {exchange_not_durable, rabbit_exchange:name()} | + -> exchange_not_found | exchange_not_durable | rabbit_types:exchange()). -spec(info_keys/0 :: () -> rabbit_types:info_keys()). -spec(info/1 :: (rabbit_types:exchange()) -> rabbit_types:infos()). @@ -291,11 +290,11 @@ update(Name, Fun) -> ok = mnesia:write(rabbit_exchange, X1, write), case Durable of true -> ok = mnesia:write(rabbit_durable_exchange, X1, write); - _ -> {exchange_not_durable, Name} + _ -> exchange_not_durable end, X1; [] -> - {exchange_not_found, Name} + exchange_not_found end. info_keys() -> ?INFO_KEYS. diff --git a/src/rabbit_policy.erl b/src/rabbit_policy.erl index 184e1c33..ca2837f5 100644 --- a/src/rabbit_policy.erl +++ b/src/rabbit_policy.erl @@ -176,9 +176,9 @@ update_exchange(X = #exchange{name = XName, policy = OldPolicy}, Policies) -> rabbit_exchange_decorator:set( X0 #exchange{policy = NewPolicy}) end) of - #exchange{} = X1 -> {X, X1}; - {exchange_not_found, _} -> {X, X }; - {exchange_not_durable, _} -> {X, X } + #exchange{} = X1 -> {X, X1}; + exchange_not_found -> {X, X }; + exchange_not_durable -> {X, X } end end. |