diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-02-10 17:08:24 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-02-10 17:08:24 +0000 |
| commit | 89a2adc676e8ef3deba8b3423878c763d8aca2f5 (patch) | |
| tree | 875eada7156728ad8954f42ca48ab76838cfb2b2 /src | |
| parent | 0acdd1c4779dfb229a3fd2538b4bab2c60aa77a3 (diff) | |
| download | rabbitmq-server-git-89a2adc676e8ef3deba8b3423878c763d8aca2f5.tar.gz | |
close_channel is no longer needed in reader, which means that closing as a channel state is no longer needed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_reader.erl | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 951cf439d6..4d02657fd4 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -439,10 +439,6 @@ close_connection(State = #v1{queue_collector = Collector, erlang:send_after(TimeoutMillisec, self(), terminate_connection), State#v1{connection_state = closed}. -close_channel(Channel, State) -> - put({channel, Channel}, closing), - State. - handle_dependent_exit(ChPid, Reason, State) -> case termination_kind(Reason) of controlled -> @@ -566,25 +562,6 @@ handle_frame(Type, Channel, Payload, _ -> State end; - 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:internal_send_command( - State#v1.sock, Channel, - #'channel.close_ok'{}, Protocol); - _ -> ok - end, - State; undefined -> case ?IS_RUNNING(State) of true -> send_to_new_channel( |