summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Hood <0x6e6562@gmail.com>2008-10-07 12:08:31 +0100
committerBen Hood <0x6e6562@gmail.com>2008-10-07 12:08:31 +0100
commitf53a02b832ad72f767f72a6b6422cafbcc3d0362 (patch)
tree2b7a636088dd11353b06e44885d1266fb540bfc3
parent13a0d5bc218b3fde3d1bdba2ed426ea0e0a136ff (diff)
downloadrabbitmq-server-f53a02b832ad72f767f72a6b6422cafbcc3d0362.tar.gz
Brought forwards delete function into loop to avoid delete_object wildcard issue when it is fixed in OTP
-rw-r--r--src/rabbit_exchange.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index 946202ff..39505c5a 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -259,13 +259,13 @@ delete_bindings_for_queue(QueueName) ->
indexed_delete(Match, ForwardsDeleteFun, ReverseDeleteFun) ->
lists:foreach(fun(Route) ->
- ok = ReverseDeleteFun(reverse_route(Route))
- end, mnesia:match_object(Match)),
- ForwardsDeleteFun(Match).
+ ok = ReverseDeleteFun(reverse_route(Route)),
+ ok = ForwardsDeleteFun(Route)
+ end, mnesia:match_object(Match)).
-delete_forward_routes(Match) ->
- ok = mnesia:delete_object(Match),
- ok = mnesia:delete_object(durable_routes, Match, write).
+delete_forward_routes(Route) ->
+ ok = mnesia:delete_object(Route),
+ ok = mnesia:delete_object(durable_routes, Route, write).
exchanges_for_queue(QueueName) ->
MatchHead = #reverse_route{reverse_binding =