summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-01-13 16:06:54 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2012-01-13 16:06:54 +0000
commit605933c2922dab2c42bc49a0932e37dc07f64d0d (patch)
tree95368f2b22e2241e42282a1de2dad61a55824e1a
parent46a479d02ac450a49d68163425b6a9d211e1f524 (diff)
downloadrabbitmq-server-git-605933c2922dab2c42bc49a0932e37dc07f64d0d.tar.gz
cosmetic(ish)
-rw-r--r--src/rabbit_channel.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index db9ff7a041..b478d9f99f 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -1345,15 +1345,15 @@ notify_limiter(Limiter, Acked) ->
deliver_to_queues({Delivery = #delivery{message = Message = #basic_message{
exchange_name = XName},
- mandatory = Mandatory,
- immediate = Immediate,
+ mandatory = Mandatory,
+ immediate = Immediate,
msg_seq_no = MsgSeqNo},
QNames}, State) ->
{RoutingRes, DeliveredQPids} = rabbit_router:deliver(QNames, Delivery),
State1 = lists:foldl(fun monitor_queue/2, State, DeliveredQPids),
- case Mandatory orelse Immediate of
- false -> [rabbit_flow:send(QPid) || QPid <- DeliveredQPids];
- _ -> ok
+ case {Mandatory, Immediate} of
+ {false, false} -> [rabbit_flow:send(QPid) || QPid <- DeliveredQPids];
+ _ -> ok
end,
State2 = process_routing_result(RoutingRes, DeliveredQPids,
XName, MsgSeqNo, Message, State1),