diff options
| author | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-01-31 11:00:20 +0000 |
|---|---|---|
| committer | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-01-31 11:00:20 +0000 |
| commit | f3984e67459c727687e0f37c735505b21308cb5c (patch) | |
| tree | ffd929da5a76594220814a4961cc04a513a5bb27 | |
| parent | 015259227e055cd6dbac5c43a05cb670a681398b (diff) | |
| download | rabbitmq-server-f3984e67459c727687e0f37c735505b21308cb5c.tar.gz | |
Renamede reject_tx/4 to reject/4.
| -rw-r--r-- | src/rabbit_channel.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 1d871bb9..71d3a220 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -664,7 +664,7 @@ handle_method(#'basic.nack'{delivery_tag = DeliveryTag, multiple = Multiple, requeue = Requeue}, _, State) -> - reject_tx(DeliveryTag, Multiple, Requeue, State); + reject(DeliveryTag, Multiple, Requeue, State); handle_method(#'basic.ack'{delivery_tag = DeliveryTag, multiple = Multiple}, @@ -865,7 +865,7 @@ handle_method(#'basic.recover'{requeue = Requeue}, Content, State) -> handle_method(#'basic.reject'{delivery_tag = DeliveryTag, requeue = Requeue}, _, State) -> - reject_tx(DeliveryTag, false, Requeue, State); + reject(DeliveryTag, false, Requeue, State); handle_method(#'exchange.declare'{exchange = ExchangeNameBin, type = TypeNameBin, @@ -1274,8 +1274,8 @@ basic_return(#basic_message{exchange_name = ExchangeName, routing_key = RoutingKey}, Content). -reject_tx(DeliveryTag, Multiple, Requeue, - State = #ch{unacked_message_q = UAMQ, tx_status = TxStatus}) -> +reject(DeliveryTag, Multiple, Requeue, + State = #ch{unacked_message_q = UAMQ, tx_status = TxStatus}) -> {Acked, Remaining} = collect_acks(UAMQ, DeliveryTag, Multiple), State1 = State#ch{unacked_message_q = Remaining}, {noreply, |