diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_exchange_type_topic.erl | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/rabbit_exchange_type_topic.erl b/src/rabbit_exchange_type_topic.erl index c1741b30a7..a23df31f5b 100644 --- a/src/rabbit_exchange_type_topic.erl +++ b/src/rabbit_exchange_type_topic.erl @@ -66,16 +66,21 @@ add_binding(false, _Exchange, _Binding) -> ok. remove_bindings(true, _X, Bs) -> - lists:foreach(fun remove_binding/1, Bs), + ToDelete = + lists:foldr(fun(B = #binding{source = X, destination = D}, Acc) -> + [{FinalNode, _} | _] = binding_path(B), + [{X, FinalNode, D} | Acc] + end, [], Bs), + [trie_remove_binding(X, FinalNode, D) || {X, FinalNode, D} <- ToDelete], ok; -remove_bindings(false, _X, _Bs) -> +remove_bindings(false, _X, Bs) -> + [rabbit_misc:execute_mnesia_transaction( + fun() -> remove_path_if_empty(X, binding_path(B)) end) + || B = #binding{source = X} <- Bs], ok. -remove_binding(#binding{source = X, key = K, destination = D}) -> - Path = [{FinalNode, _} | _] = follow_down_get_path(X, split_topic_key(K)), - trie_remove_binding(X, FinalNode, D), - remove_path_if_empty(X, Path), - ok. +binding_path(#binding{source = X, key = K}) -> + follow_down_get_path(X, split_topic_key(K)). assert_args_equivalence(X, Args) -> rabbit_exchange:assert_args_equivalence(X, Args). |