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_basic.erl | |
| parent | 8f813bf1397993b06061c50033b572e6659c74bb (diff) | |
| parent | 65efc39ab5e6669c4088e5d26d7885ba252dcf58 (diff) | |
| download | rabbitmq-server-bbbc73e4e6a6b0f41cd78cc3724c6b0b1893d35e.tar.gz | |
merge default into bug20337
Diffstat (limited to 'src/rabbit_basic.erl')
| -rw-r--r-- | src/rabbit_basic.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl index bc2f6ea9..4196db7d 100644 --- a/src/rabbit_basic.erl +++ b/src/rabbit_basic.erl @@ -30,7 +30,7 @@ -type(properties_input() :: (rabbit_framing:amqp_property_record() | [{atom(), any()}])). -type(publish_result() :: - ({ok, rabbit_router:routing_result(), [pid()]} + ({ok, rabbit_amqqueue:routing_result(), [pid()]} | rabbit_types:error('not_found'))). -type(exchange_input() :: (rabbit_types:exchange() | rabbit_exchange:name())). @@ -89,8 +89,8 @@ publish(Delivery = #delivery{ end. publish(X, Delivery) -> - {RoutingRes, DeliveredQPids} = - rabbit_router:deliver(rabbit_exchange:route(X, Delivery), Delivery), + Qs = rabbit_amqqueue:lookup(rabbit_exchange:route(X, Delivery)), + {RoutingRes, DeliveredQPids} = rabbit_amqqueue:deliver(Qs, Delivery), {ok, RoutingRes, DeliveredQPids}. delivery(Mandatory, Immediate, Message, MsgSeqNo) -> |