Merged bug 21848 into amqp_0_9_1

1 files changed, 8 insertions, 0 deletions

diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index c6b7f19fab..3e03ae0c36 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -490,10 +490,18 @@ handle_frame(Type, Channel, Payload, State) ->
                 closing ->
                     %% According to the spec, after sending a
                     %% channel.close we must ignore all frames except
+                    %% channel.close and channel.close_ok.  In the
+                    %% event of a channel.close, we should send back a
                     %% channel.close_ok.
                     case AnalyzedFrame of
                         {method, 'channel.close_ok', _} ->
                             erase({channel, Channel});
+                        {method, 'channel.close', _} ->
+                            %% We're already closing this channel, so
+                            %% there's no cleanup to do (notify
+                            %% queues, etc.)
+                            ok = rabbit_writer:send_command(State#v1.sock,
+                                                            #'channel.close_ok'{});
                         _ -> ok
                     end,
                     State;