diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2013-01-24 15:24:29 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2013-01-24 15:24:29 +0000 |
| commit | 0e595a058d9851a337faaf3b5f7845d11c2ca66f (patch) | |
| tree | d7bac37c9d6796f79210671508d6cd6549e6a4ea | |
| parent | 76000f2f9b232e4c28ab1fb48223b0710433a6d2 (diff) | |
| parent | f43c487a9b48a386fe1f9883fec8f97f94ccf830 (diff) | |
| download | rabbitmq-server-git-0e595a058d9851a337faaf3b5f7845d11c2ca66f.tar.gz | |
merge bug25412 into stable
| -rw-r--r-- | src/rabbit_channel.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 84753f38f4..a715b291eb 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -587,8 +587,10 @@ handle_method(_Method, _, #ch{state = starting}) -> handle_method(#'channel.close_ok'{}, _, #ch{state = closing}) -> stop; -handle_method(#'channel.close'{}, _, State = #ch{state = closing}) -> - {reply, #'channel.close_ok'{}, State}; +handle_method(#'channel.close'{}, _, State = #ch{writer_pid = WriterPid, + state = closing}) -> + ok = rabbit_writer:send_command(WriterPid, #'channel.close_ok'{}), + {noreply, State}; handle_method(_Method, _, State = #ch{state = closing}) -> {noreply, State}; |