diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-03-23 14:39:30 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-03-23 14:39:30 +0000 |
| commit | 3567459a49f40210dbc8507fb0d1e91b7af6f09e (patch) | |
| tree | 32f35bf34760210eb2ced6331a99f53e61c80f3e /src | |
| parent | 8f25204f353b651e6b856b3aaba6dd4fef3b6fc8 (diff) | |
| download | rabbitmq-server-git-3567459a49f40210dbc8507fb0d1e91b7af6f09e.tar.gz | |
correct return value of rabbit_amqqueue:delete_immediately/1
...and be more assertive
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_queue_collector.erl | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 4f06630b90..7c20f67dc8 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -463,7 +463,8 @@ stat(#amqqueue{pid = QPid}) -> delegate_call(QPid, stat). delete_immediately(QPids) -> - [gen_server2:cast(QPid, delete_immediately) || QPid <- QPids]. + [gen_server2:cast(QPid, delete_immediately) || QPid <- QPids], + ok. delete(#amqqueue{ pid = QPid }, IfUnused, IfEmpty) -> delegate_call(QPid, {delete, IfUnused, IfEmpty}). diff --git a/src/rabbit_queue_collector.erl b/src/rabbit_queue_collector.erl index 6ebde2aab5..be13b7f9df 100644 --- a/src/rabbit_queue_collector.erl +++ b/src/rabbit_queue_collector.erl @@ -59,7 +59,7 @@ handle_call({register, QPid}, _From, State = #state{monitors = QMons, delete_from = Deleting}) -> case Deleting of undefined -> ok; - _ -> rabbit_amqqueue:delete_immediately(QPid) + _ -> ok = rabbit_amqqueue:delete_immediately(QPid) end, {reply, ok, State#state{monitors = pmon:monitor(QPid, QMons)}}; @@ -67,7 +67,7 @@ handle_call(delete_all, From, State = #state{monitors = QMons, delete_from = undefined}) -> case pmon:monitored(QMons) of [] -> {reply, ok, State#state{delete_from = From}}; - QPids -> rabbit_amqqueue:delete_immediately(QPids), + QPids -> ok = rabbit_amqqueue:delete_immediately(QPids), {noreply, State#state{delete_from = From}} end. |