summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2011-03-17 14:41:03 +0000
committerMatthew Sackman <matthew@rabbitmq.com>2011-03-17 14:41:03 +0000
commitdb36c19f6504dbd1b9d2c1cf0bef30102d8778f9 (patch)
treef70da738dcb3357aaa86ea3e9207503ffc381ede /src
parentd1863a3d017a7991457c19b5daaf32abc56c6fc4 (diff)
downloadrabbitmq-server-git-db36c19f6504dbd1b9d2c1cf0bef30102d8778f9.tar.gz
Make sure we record if an exchange is actually deleted...
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_binding.erl13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl
index 7ddb781412..1a9cbde1c6 100644
--- a/src/rabbit_binding.erl
+++ b/src/rabbit_binding.erl
@@ -335,12 +335,13 @@ maybe_auto_delete(XName, Bindings, Deletions) ->
[] ->
add_deletion(XName, {undefined, not_deleted, Bindings}, Deletions);
[X] ->
- add_deletion(XName, {X, not_deleted, Bindings},
- case rabbit_exchange:maybe_auto_delete(X) of
- not_deleted -> Deletions;
- {deleted, Deletions1} -> combine_deletions(
- Deletions, Deletions1)
- end)
+ case rabbit_exchange:maybe_auto_delete(X) of
+ not_deleted ->
+ add_deletion(XName, {X, not_deleted, Bindings}, Deletions);
+ {deleted, Deletions1} ->
+ add_deletion(XName, {X, deleted, Bindings},
+ combine_deletions(Deletions, Deletions1))
+ end
end.
delete_forward_routes(Route) ->