summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2011-07-07 13:28:32 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2011-07-07 13:28:32 +0100
commit27a4d83849a745a6eb6432f1b7bae9c2299fefca (patch)
tree17341bff9a28cd119125d4cc72a50aa21ebe122c
parentfc88a5e37bcd0eb4c805d0b74a0b23cb1d3f89dd (diff)
downloadrabbitmq-server-bug24244.tar.gz
inliningbug24244
-rw-r--r--src/rabbit_binding.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl
index b88e6977..205d5bba 100644
--- a/src/rabbit_binding.erl
+++ b/src/rabbit_binding.erl
@@ -105,8 +105,12 @@ recover(XNames, QNames) ->
end, rabbit_durable_route),
XNameSet = sets:from_list(XNames),
QNameSet = sets:from_list(QNames),
- [recover_semi_durable_route(R, set(destination(R), XNameSet, QNameSet)) ||
- R <- rabbit_misc:dirty_read_all(rabbit_semi_durable_route)],
+ SelectSet = fun (#resource{kind = exchange}) -> XNameSet;
+ (#resource{kind = queue}) -> QNameSet
+ end,
+ [recover_semi_durable_route(R, SelectSet(Dst)) ||
+ R = #route{binding = #binding{destination = Dst}} <-
+ rabbit_misc:dirty_read_all(rabbit_semi_durable_route)],
ok.
recover_semi_durable_route(R = #route{binding = B}, ToRecover) ->
@@ -126,10 +130,6 @@ recover_semi_durable_route(R = #route{binding = B}, ToRecover) ->
(Serial, false) -> x_callback(Serial, X, add_binding, B)
end).
-destination(#route{binding = #binding{destination = D}}) -> D.
-set(#resource{kind = exchange}, XNameSet, _) -> XNameSet;
-set(#resource{kind = queue}, _, QNameSet) -> QNameSet.
-
exists(Binding) ->
binding_action(
Binding, fun (_Src, _Dst, B) ->