Don't call InnerFun and remove/3 if the binding was not there.

1 files changed, 9 insertions, 7 deletions

diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl
index 11e6bd38f6..ff950cc73a 100644
--- a/src/rabbit_binding.erl
+++ b/src/rabbit_binding.erl
@@ -200,13 +200,15 @@ remove(Binding, InnerFun) ->
     binding_action(
       Binding,
       fun (Src, Dst, B) ->
-              case mnesia:read(rabbit_route, B, write) =:= [] andalso
-                  mnesia:read(rabbit_durable_route, B, write) =/= [] of
-                  true  -> rabbit_misc:const({error, binding_not_found});
-                  false -> case InnerFun(Src, Dst) of
-                               ok               -> remove(Src, Dst, B);
-                               {error, _} = Err -> rabbit_misc:const(Err)
-                           end
+              case mnesia:read(rabbit_route, B, write) of
+                  [] -> case mnesia:read(rabbit_durable_route, B, write) of
+                            [] -> rabbit_misc:const(ok);
+                            _  -> rabbit_misc:const({error, binding_not_found})
+                        end;
+                  _  -> case InnerFun(Src, Dst) of
+                            ok               -> remove(Src, Dst, B);
+                            {error, _} = Err -> rabbit_misc:const(Err)
+                        end
               end
       end, fun absent_errs_only/1).