re-merge bug21377

since it had a dangling head

1 files changed, 3 insertions, 3 deletions

diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl
index 9d1399f7cc..668fb9bb25 100644
--- a/src/rabbit_binding.erl
+++ b/src/rabbit_binding.erl
@@ -350,10 +350,10 @@ group_bindings_fold(Fun, SrcName, Acc, Removed, Bindings) ->
     group_bindings_fold(Fun, Fun(SrcName, Bindings, Acc), Removed).
 
 maybe_auto_delete(XName, Bindings, Deletions) ->
-    case rabbit_exchange:lookup(XName) of
-        {error, not_found} ->
+    case mnesia:read(rabbit_exchange, XName) of
+        [] ->
             add_deletion(XName, {undefined, not_deleted, Bindings}, Deletions);
-        {ok, X} ->
+        [X] ->
             add_deletion(XName, {X, not_deleted, Bindings},
                          case rabbit_exchange:maybe_auto_delete(X) of
                              not_deleted           -> Deletions;