summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2008-10-12 23:43:16 +0100
committerMatthias Radestock <matthias@lshift.net>2008-10-12 23:43:16 +0100
commit908357efbd78adc3b31351eecb38730b52682453 (patch)
tree49fa36f03163447ef628dbb701ccf2611b7d1aba /src
parent75fba37dd35e689ea0d2a6a171b22b6818a1d7af (diff)
downloadrabbitmq-server-git-908357efbd78adc3b31351eecb38730b52682453.tar.gz
maybe_auto_delete should always return ok
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_exchange.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index b1ef605fda..2db7758d7a 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -384,7 +384,8 @@ delete(ExchangeName, _IfUnused = false) ->
maybe_auto_delete(#exchange{auto_delete = false}) ->
ok;
maybe_auto_delete(Exchange = #exchange{auto_delete = true}) ->
- conditional_delete(Exchange).
+ conditional_delete(Exchange),
+ ok.
conditional_delete(Exchange = #exchange{name = ExchangeName}) ->
case has_bindings(ExchangeName) of