diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-01-16 11:03:38 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-01-16 11:03:38 +0000 |
| commit | b7aca5bbc2d9b7db8200f1939e641a9a7c258a80 (patch) | |
| tree | 38e1ba99a5ef435317f4c9b69b3b5e022b1cfa61 /src/rabbit_basic.erl | |
| parent | 3dc1d7a21e47e708dc207f202333c9bf895d0828 (diff) | |
| download | rabbitmq-server-b7aca5bbc2d9b7db8200f1939e641a9a7c258a80.tar.gz | |
merge rabbit_router:deliver into rabbit_amqqueue:deliverbug24681
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 b266d366..b116821c 100644 --- a/src/rabbit_basic.erl +++ b/src/rabbit_basic.erl @@ -29,7 +29,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())). @@ -88,8 +88,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) -> |