diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-04-05 12:09:13 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-04-05 12:09:13 +0100 |
| commit | 6bfb13e3561aaf85d2febb60fea3e89f440a3580 (patch) | |
| tree | 0b0345d5277a0fe760546f61b7c807ff00ee680e | |
| parent | 95f132f8a4324906a108208c37b720c8e811206d (diff) | |
| download | rabbitmq-server-6bfb13e3561aaf85d2febb60fea3e89f440a3580.tar.gz | |
Revert bc5bcde98866
| -rw-r--r-- | src/rabbit_binding.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_exchange.erl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl index 557a8f29..8c6732f9 100644 --- a/src/rabbit_binding.erl +++ b/src/rabbit_binding.erl @@ -108,10 +108,6 @@ recover(XNames, QNames) -> end, dict:new(), rabbit_durable_route), rabbit_misc:execute_pre_post_mnesia_tx( fun (Tx) -> - [begin - {ok, X} = rabbit_exchange:lookup(XName), - rabbit_exchange:callback(X, create, [Tx, X]) - end|| XName <- XNames], dict:map(fun (XName, Bindings) -> {ok, X} = rabbit_exchange:lookup(XName), rabbit_exchange:callback(X, add_bindings, diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index acbc6c90..b39fe32c 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -91,6 +91,10 @@ recover() -> [_] -> Acc end end, [], rabbit_durable_exchange), + rabbit_misc:execute_pre_post_mnesia_tx( + fun (Tx) -> + [rabbit_exchange:callback(X, create, [Tx, X]) || X <- Xs] + end), [XName || #exchange{name = XName} <- Xs]. callback(#exchange{type = XType}, Fun, Args) -> |