diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-06-24 15:31:30 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-06-24 15:31:30 +0100 |
| commit | df0bfa412229cb8d65bc7f06e2c2a3704193be26 (patch) | |
| tree | 305749bd3c4503402f13b5f706776424845bff8d | |
| parent | 566ce4e3231b9586f371735a0f367dca3a4d1910 (diff) | |
| parent | 7fcf648d2dc813de187c08180a79641a19c599e9 (diff) | |
| download | rabbitmq-server-df0bfa412229cb8d65bc7f06e2c2a3704193be26.tar.gz | |
merge bug22888 into default
| -rw-r--r-- | src/rabbit_channel.erl | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index ced6c1c7..d337df29 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -605,8 +605,7 @@ handle_method(#'basic.qos'{prefetch_count = PrefetchCount}, {reply, #'basic.qos_ok'{}, State#ch{limiter_pid = LimiterPid2}}; handle_method(#'basic.recover_async'{requeue = true}, - _, State = #ch{ transaction_id = none, - unacked_message_q = UAMQ }) -> + _, State = #ch{ unacked_message_q = UAMQ }) -> ok = fold_per_queue( fun (QPid, MsgIds, ok) -> %% The Qpid python test suite incorrectly assumes @@ -621,8 +620,7 @@ handle_method(#'basic.recover_async'{requeue = true}, {noreply, State#ch{unacked_message_q = queue:new()}}; handle_method(#'basic.recover_async'{requeue = false}, - _, State = #ch{ transaction_id = none, - writer_pid = WriterPid, + _, State = #ch{ writer_pid = WriterPid, unacked_message_q = UAMQ }) -> ok = rabbit_misc:queue_fold( fun ({_DeliveryTag, none, _Msg}, ok) -> @@ -646,10 +644,6 @@ handle_method(#'basic.recover_async'{requeue = false}, %% variant of this method {noreply, State}; -handle_method(#'basic.recover_async'{}, _, _State) -> - rabbit_misc:protocol_error( - not_allowed, "attempt to recover a transactional channel",[]); - handle_method(#'basic.recover'{requeue = Requeue}, Content, State) -> {noreply, State2 = #ch{writer_pid = WriterPid}} = handle_method(#'basic.recover_async'{requeue = Requeue}, |