diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-08-26 15:28:42 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-08-26 15:28:42 +0100 |
| commit | 10d0bc116137460a0890a052163916c7e70bb71a (patch) | |
| tree | a1e1cc8480d8812f97160743e9ca20d4060e6aa5 /src | |
| parent | 2bd0541ad102ec76334dbc7cdf1d414e182b363c (diff) | |
| download | rabbitmq-server-git-10d0bc116137460a0890a052163916c7e70bb71a.tar.gz | |
Removal of pointless calls to run_message_queue
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index b4b06b1690..5d78b2055f 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -322,7 +322,7 @@ deliver_or_enqueue(Txn, ChPid, Msg, State) -> %% all these messages have already been delivered at least once and %% not ack'd, but need to be either redelivered or requeued deliver_or_requeue_n([], State) -> - run_message_queue(State); + State; deliver_or_requeue_n(MsgsWithAcks, State) -> Funs = { fun deliver_or_requeue_msgs_pred/2, fun deliver_or_requeue_msgs_deliver/3 }, @@ -332,7 +332,7 @@ deliver_or_requeue_n(MsgsWithAcks, State) -> {ok, MS} = rabbit_mixed_queue:ack(AutoAcks, NewState #q.mixed_state), case OutstandingMsgs of - [] -> run_message_queue(NewState #q { mixed_state = MS }); + [] -> NewState #q { mixed_state = MS }; _ -> {ok, MS1} = rabbit_mixed_queue:requeue(OutstandingMsgs, MS), NewState #q { mixed_state = MS1 } end. |