summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2015-01-30 11:56:14 +0000
committerSimon MacMullen <simon@rabbitmq.com>2015-01-30 11:56:14 +0000
commit9388c6613c1789516614077868b1b7417979ddff (patch)
tree0dfbeb443034d8e44a4fd65f5a28c8e142c40424 /src
parent3948c08b6ed09c4bd8a2bbfb8e3b40481f86b574 (diff)
parentc909a478212e7868adf1f5639fad200cb2b9700d (diff)
downloadrabbitmq-server-git-9388c6613c1789516614077868b1b7417979ddff.tar.gz
Merge in default
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_amqqueue_process.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 3f69c9af4f..c6030a090e 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -153,7 +153,6 @@ init_it2(Recover, From, State = #q{q = Q,
#amqqueue{} = Q1 ->
case matches(Recover, Q, Q1) of
true ->
- send_reply(From, {new, Q}),
ok = file_handle_cache:register_callback(
rabbit_amqqueue, set_maximum_since_use, [self()]),
ok = rabbit_memory_monitor:register(
@@ -161,6 +160,7 @@ init_it2(Recover, From, State = #q{q = Q,
set_ram_duration_target, [self()]}),
BQ = backing_queue_module(Q1),
BQS = bq_init(BQ, Q, TermsOrNew),
+ send_reply(From, {new, Q}),
recovery_barrier(Barrier),
State1 = process_args_policy(
State#q{backing_queue = BQ,