diff options
author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2012-01-24 18:27:38 +0000 |
---|---|---|
committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2012-01-24 18:27:38 +0000 |
commit | bbbc73e4e6a6b0f41cd78cc3724c6b0b1893d35e (patch) | |
tree | cff4001e2d7dcded69dd810989a035c579ff2b62 /src/rabbit_channel.erl | |
parent | 8f813bf1397993b06061c50033b572e6659c74bb (diff) | |
parent | 65efc39ab5e6669c4088e5d26d7885ba252dcf58 (diff) | |
download | rabbitmq-server-bbbc73e4e6a6b0f41cd78cc3724c6b0b1893d35e.tar.gz |
merge default into bug20337
Diffstat (limited to 'src/rabbit_channel.erl')
-rw-r--r-- | src/rabbit_channel.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 9df862c6..4c4ba230 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -1358,7 +1358,8 @@ deliver_to_queues({Delivery = #delivery{message = Message = #basic_message{ exchange_name = XName}, msg_seq_no = MsgSeqNo}, QNames}, State) -> - {RoutingRes, DeliveredQPids} = rabbit_router:deliver(QNames, Delivery), + {RoutingRes, DeliveredQPids} = + rabbit_amqqueue:deliver(rabbit_amqqueue:lookup(QNames), Delivery), State1 = process_routing_result(RoutingRes, DeliveredQPids, XName, MsgSeqNo, Message, State), maybe_incr_stats([{XName, 1} | |