diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-09-04 04:29:22 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-09-04 04:29:22 +0100 |
| commit | 19803f9e9d6b4dc4b32e564283b1afb40614e8a2 (patch) | |
| tree | 883ce25975f017b59875b24d0ad1518c9d1ec0da /src/rabbit_exchange.erl | |
| parent | 0b92f1253f2e1eac5a75a044068affc9fcd89dcc (diff) | |
| download | rabbitmq-server-19803f9e9d6b4dc4b32e564283b1afb40614e8a2.tar.gz | |
further binding API tweaks
Diffstat (limited to 'src/rabbit_exchange.erl')
| -rw-r--r-- | src/rabbit_exchange.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index d98cb20d..68290aa1 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -289,13 +289,13 @@ maybe_auto_delete(#exchange{auto_delete = true} = Exchange) -> end. conditional_delete(Exchange = #exchange{name = ExchangeName}) -> - case rabbit_binding:has_exchange_bindings(ExchangeName) of + case rabbit_binding:has_for_exchange(ExchangeName) of false -> unconditional_delete(Exchange); true -> {error, in_use} end. unconditional_delete(Exchange = #exchange{name = ExchangeName}) -> - Bindings = rabbit_binding:delete_exchange_bindings(ExchangeName), + Bindings = rabbit_binding:remove_for_exchange(ExchangeName), ok = mnesia:delete({rabbit_durable_exchange, ExchangeName}), ok = mnesia:delete({rabbit_exchange, ExchangeName}), rabbit_event:notify(exchange_deleted, [{name, ExchangeName}]), |