diff options
| author | David Wragg <dpw@lshift.net> | 2010-04-30 12:25:45 +0100 |
|---|---|---|
| committer | David Wragg <dpw@lshift.net> | 2010-04-30 12:25:45 +0100 |
| commit | 8b3497ebc435f158079effc6ff1e788c8fffc4cd (patch) | |
| tree | 1539e38c0b2b03305074a151d90f18c119011b38 | |
| parent | f2e7894c124c07bb67fffd6b7483e5138713f853 (diff) | |
| download | rabbitmq-server-git-8b3497ebc435f158079effc6ff1e788c8fffc4cd.tar.gz | |
R12 cleanups from new persister branch
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 82e3e05ef3..f0637363bb 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -276,16 +276,12 @@ deliver_or_enqueue_n(Messages, State = #q{message_buffer = MessageBuffer}) -> add_consumer(ChPid, Consumer, Queue) -> queue:in({ChPid, Consumer}, Queue). remove_consumer(ChPid, ConsumerTag, Queue) -> - %% TODO: replace this with queue:filter/2 once we move to R12 - queue:from_list(lists:filter( - fun ({CP, #consumer{tag = CT}}) -> - (CP /= ChPid) or (CT /= ConsumerTag) - end, queue:to_list(Queue))). + queue:filter(fun ({CP, #consumer{tag = CT}}) -> + (CP /= ChPid) or (CT /= ConsumerTag) + end, Queue). remove_consumers(ChPid, Queue) -> - %% TODO: replace this with queue:filter/2 once we move to R12 - queue:from_list(lists:filter(fun ({CP, _}) -> CP /= ChPid end, - queue:to_list(Queue))). + queue:filter(fun ({CP, _}) -> CP /= ChPid end, Queue). move_consumers(ChPid, From, To) -> {Kept, Removed} = lists:partition(fun ({CP, _}) -> CP /= ChPid end, |