diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-06-09 11:06:11 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-06-09 11:06:11 +0100 |
| commit | aab6cdda63645d3253be6382a5504128c4a82dee (patch) | |
| tree | 167f3f468065152a55d3ac302168e205f9015b1d | |
| parent | 9bf1d86e4b4b919f7799c0f1dec99b1043ef9707 (diff) | |
| download | rabbitmq-server-git-aab6cdda63645d3253be6382a5504128c4a82dee.tar.gz | |
Logic failure which only came to light when trying to run the consumers as documented in bug 20470
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index b61e450bd0..81dea02789 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -178,9 +178,11 @@ deliver_queue(Fun, FunAcc0, unsent_message_count = Count, unacked_messages = UAM} = ch_record(ChPid), IsMsgReady = Fun(is_message_ready, FunAcc0, State), - case not(AckRequired) orelse - ( IsMsgReady andalso - rabbit_limiter:can_send( LimiterPid, self()) + case IsMsgReady + andalso + ( (not AckRequired) + orelse + rabbit_limiter:can_send( LimiterPid, self() ) ) of true -> case Fun(AckRequired, FunAcc0, State) of |