summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2010-08-18 17:40:19 +0100
committerMatthew Sackman <matthew@rabbitmq.com>2010-08-18 17:40:19 +0100
commit0af3a826e9a4743256ae8e86d1dcce2a9df4ef40 (patch)
tree7c63c6d3c58e82f703945e375b1979eb75233fbd
parent829a56efa6820cc46cf4f3f12a9e22a21c4befe5 (diff)
downloadrabbitmq-server-0af3a826e9a4743256ae8e86d1dcce2a9df4ef40.tar.gz
Don't ever keep the recovery process waiting, regardless of whether the queue is going down or not
(transplanted from 4c99ba7eedd4b28a096d0412bbbdacb1fa91daa3)
-rw-r--r--src/rabbit_amqqueue_process.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index d52660c5..2cab7136 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -603,6 +603,7 @@ handle_call({init, Recover}, From,
declare(Recover, From, State);
_ -> #q{q = #amqqueue{name = QName, durable = IsDurable},
backing_queue = BQ, backing_queue_state = undefined} = State,
+ gen_server2:reply(From, not_found),
case Recover of
true -> ok;
_ -> rabbit_log:warning(
@@ -610,7 +611,7 @@ handle_call({init, Recover}, From,
end,
BQS = BQ:init(QName, IsDurable, Recover),
%% Rely on terminate to delete the queue.
- {stop, normal, not_found, State#q{backing_queue_state = BQS}}
+ {stop, normal, State#q{backing_queue_state = BQS}}
end;
handle_call(info, _From, State) ->