Remove from all forward routing tables in remove_for_source.

1 files changed, 10 insertions, 5 deletions

diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl
index 3c835b56e6..016e870733 100644
--- a/src/rabbit_binding.erl
+++ b/src/rabbit_binding.erl
@@ -248,11 +248,16 @@ remove_for_source(SrcName) ->
                                    reverse_route(Route), write),
          ok = delete_forward_routes(Route),
          Route#route.binding
-     end || Route <- mnesia:match_object(
-                       rabbit_route,
-                       #route{binding = #binding{source = SrcName,
-                                                 _      = '_'}},
-                       write)].
+     end || Route <- sets:to_list(
+                       sets:union(
+                         [sets:from_list(routes_for_source(SrcName, T)) ||
+                             T <- [rabbit_route, rabbit_semi_durable_route,
+                                   rabbit_durable_route]]))].
+
+routes_for_source(SrcName, Table) ->
+    mnesia:match_object(Table, #route{binding = #binding{source = SrcName,
+                                                         _      = '_'}},
+                        write).
 
 remove_for_destination(DstName) ->
     remove_for_destination(DstName, fun delete_forward_routes/1).