diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-04-12 13:59:45 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-04-12 13:59:45 +0100 |
| commit | 96444ccec00a7cc8f5fa4d81cddfc873b17c67b7 (patch) | |
| tree | 53be0e6eb21265885e95a107deef03c335858ebb /src | |
| parent | 4bb5cb57918a3ec73af83c486ecbda1930aef1a6 (diff) | |
| parent | 0b13fab6a6e10587b73ecc88806f4a04e37f10ed (diff) | |
| download | rabbitmq-server-96444ccec00a7cc8f5fa4d81cddfc873b17c67b7.tar.gz | |
Merge bug 24769.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_backing_queue_qc.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/rabbit_backing_queue_qc.erl b/src/rabbit_backing_queue_qc.erl index 7b00fa5f..286b69e4 100644 --- a/src/rabbit_backing_queue_qc.erl +++ b/src/rabbit_backing_queue_qc.erl @@ -141,7 +141,7 @@ qc_drain_confirmed(#state{bqstate = BQ}) -> {call, ?BQMOD, drain_confirmed, [BQ]}. qc_dropwhile(#state{bqstate = BQ}) -> - {call, ?BQMOD, dropwhile, [fun dropfun/1, BQ]}. + {call, ?BQMOD, dropwhile, [fun dropfun/1, fun (_,_) -> ok end, BQ]}. qc_is_empty(#state{bqstate = BQ}) -> {call, ?BQMOD, is_empty, [BQ]}. diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 2245cf65..846890a1 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -758,9 +758,7 @@ handle_method(#'basic.cancel'{consumer_tag = ConsumerTag, fun () -> {error, not_found} end, fun () -> rabbit_amqqueue:basic_cancel( - Q, self(), ConsumerTag, - ok_msg(NoWait, #'basic.cancel_ok'{ - consumer_tag = ConsumerTag})) + Q, self(), ConsumerTag, ok_msg(NoWait, OkMsg)) end) of ok -> {noreply, NewState}; |