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 | a3b55bafe81509b3ee6723ae7cf9f869a4bcf128 (patch) | |
| tree | 872b7e7caff82bdc84d7568b2c6481d7d5d39d6a /src | |
| parent | fbe6e716b9a685c1e2cab1bd58787a1ab43c91f4 (diff) | |
| parent | 0e595a058d9851a337faaf3b5f7845d11c2ca66f (diff) | |
| download | rabbitmq-server-git-a3b55bafe81509b3ee6723ae7cf9f869a4bcf128.tar.gz | |
merge stable into default
Diffstat (limited to 'src')
| -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 223a39274f..160512a248 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}; |