diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-04-17 12:08:05 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-04-17 12:08:05 +0100 |
| commit | ddc0b20ee78d91884327a6683dc8f81f809ce18d (patch) | |
| tree | 913d4b7db5066ef6e55fee54c1e0baca5776c938 | |
| parent | 88381e38e3b3e017e36ceae3a1a9e1e6cc0c0f86 (diff) | |
| download | rabbitmq-server-git-ddc0b20ee78d91884327a6683dc8f81f809ce18d.tar.gz | |
Remove exchange_not_durable as, err, it would never be returned. And strip leading exchange_ since this is rabbit_exchange.
| -rw-r--r-- | src/rabbit_exchange.erl | 7 | ||||
| -rw-r--r-- | src/rabbit_policy.erl | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 1bed9344d8..b4bdd348ab 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 | exchange_not_durable | - rabbit_types:exchange()). + -> not_found | rabbit_types:exchange()). -spec(info_keys/0 :: () -> rabbit_types:info_keys()). -spec(info/1 :: (rabbit_types:exchange()) -> rabbit_types:infos()). -spec(info/2 :: @@ -290,11 +289,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 + _ -> ok end, X1; [] -> - exchange_not_found + not_found end. info_keys() -> ?INFO_KEYS. diff --git a/src/rabbit_policy.erl b/src/rabbit_policy.erl index ca2837f562..0990c662ba 100644 --- a/src/rabbit_policy.erl +++ b/src/rabbit_policy.erl @@ -176,9 +176,8 @@ 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}; + not_found -> {X, X } end end. |