diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2010-06-11 12:42:28 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2010-06-11 12:42:28 +0100 |
| commit | abc38b91168f56d99a9f1cd2aa63c100ad75f029 (patch) | |
| tree | f33367e462e094e8a5511451b315bdbb67904fd5 /src | |
| parent | 1d0e0153cbef324231783644b4293d2d9b7904ad (diff) | |
| parent | 2bf8cf6574d765ee1e185fa4d77da3c57d10c2b7 (diff) | |
| download | rabbitmq-server-git-abc38b91168f56d99a9f1cd2aa63c100ad75f029.tar.gz | |
Merged bug21846 into default
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_channel.erl | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 3ae554d065..2ebb8f886f 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -463,13 +463,7 @@ handle_method(#'basic.publish'{exchange = ExchangeNameBin, handle_method(#'basic.ack'{delivery_tag = DeliveryTag, multiple = Multiple}, _, State = #ch{transaction_id = TxnKey, - next_tag = NextDeliveryTag, unacked_message_q = UAMQ}) -> - if DeliveryTag >= NextDeliveryTag -> - rabbit_misc:protocol_error( - command_invalid, "unknown delivery tag ~w", [DeliveryTag]); - true -> ok - end, {Acked, Remaining} = collect_acks(UAMQ, DeliveryTag, Multiple), Participants = ack(TxnKey, Acked), {noreply, case TxnKey of @@ -980,7 +974,8 @@ collect_acks(ToAcc, PrefixAcc, Q, DeliveryTag, Multiple) -> QTail, DeliveryTag, Multiple) end; {empty, _} -> - {ToAcc, PrefixAcc} + rabbit_misc:protocol_error( + not_found, "unknown delivery tag ~w", [DeliveryTag]) end. add_tx_participants(MoreP, State = #ch{tx_participants = Participants}) -> |