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 | 450052add389a8ab31d5bc389c02894bf87a2f79 (patch) | |
| tree | 53be0e6eb21265885e95a107deef03c335858ebb | |
| parent | 6ddaa8a9cf63e835b37122d3894b36a2078da20e (diff) | |
| parent | ed48ba74d0d7dcc1373ac0da363802f5578a2f95 (diff) | |
| download | rabbitmq-server-git-450052add389a8ab31d5bc389c02894bf87a2f79.tar.gz | |
Merge bug 24769.
| -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 7b00fa5f13..286b69e4ac 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 2245cf657b..846890a145 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}; |