diff options
author | Matthias Radestock <matthias@rabbitmq.com> | 2013-01-24 15:24:52 +0000 |
---|---|---|
committer | Matthias Radestock <matthias@rabbitmq.com> | 2013-01-24 15:24:52 +0000 |
commit | 454c827124d2b1fa1bf9cbd8f81cfd4620a5883d (patch) | |
tree | 872b7e7caff82bdc84d7568b2c6481d7d5d39d6a | |
parent | 161aba27df4b07788ed172b96b67d7164e650dfb (diff) | |
parent | 2ccd559e8375654e9a8f8ed6acfc2490ca88de9d (diff) | |
download | rabbitmq-server-454c827124d2b1fa1bf9cbd8f81cfd4620a5883d.tar.gz |
merge stable into default
-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 223a3927..160512a2 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -576,8 +576,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}; |