summaryrefslogtreecommitdiff
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
commitb19a9ccca183885e431fd1a0a1646a2e212885ab (patch)
tree49fa36f03163447ef628dbb701ccf2611b7d1aba
parent70bf940a689e53949a7c918a56b697a16d84936c (diff)
downloadrabbitmq-server-b19a9ccca183885e431fd1a0a1646a2e212885ab.tar.gz
maybe_auto_delete should always return ok
-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 b1ef605f..2db7758d 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