diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2010-06-23 11:16:51 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2010-06-23 11:16:51 +0100 |
| commit | 5a9571b723e33526b424d50914b6acaddd4c7956 (patch) | |
| tree | cc35d07888ff7ad2693969f85e6f4aea970543d8 | |
| parent | 2049d666556fb9cddea24bec32e3170b309d988f (diff) | |
| parent | def4803ae6df2a23ed9d9dcdd27c0e315d4fd3c5 (diff) | |
| download | rabbitmq-server-git-5a9571b723e33526b424d50914b6acaddd4c7956.tar.gz | |
Merged bug21845 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 ced6c1c7ef..d337df294f 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}, |