diff options
author | Matthew Sackman <matthew@lshift.net> | 2009-08-10 15:50:50 +0100 |
---|---|---|
committer | Matthew Sackman <matthew@lshift.net> | 2009-08-10 15:50:50 +0100 |
commit | 00c42d9594f0905c8cff2970b376ea93e7d977f3 (patch) | |
tree | 1ba06374697e4208c9482a7f50c57acfe0f63877 | |
parent | 7b15f312db19a33b65937480e7b6b9beab47ff59 (diff) | |
download | rabbitmq-server-00c42d9594f0905c8cff2970b376ea93e7d977f3.tar.gz |
tidyingbug21066
-rw-r--r-- | src/rabbit_channel.erl | 2 | ||||
-rw-r--r-- | src/rabbit_reader.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index c30024a6..16b7c938 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -159,7 +159,7 @@ handle_cast({conserve_memory, Conserve}, State) -> handle_info({'EXIT', WriterPid, Reason = {writer, send_failed, _Error}}, State = #ch{writer_pid = WriterPid}) -> - State#ch.reader_pid ! {channel_unexpected_exit, Reason}, + State#ch.reader_pid ! {channel_exit, State#ch.channel, Reason}, {stop, normal, State}; handle_info({'EXIT', _Pid, Reason}, State) -> {stop, Reason, State}; diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 91732e0d..7be92812 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -286,7 +286,7 @@ mainloop(Parent, Deb, State = #v1{sock= Sock, recv_ref = Ref}) -> %% since this termination is initiated by our parent it is %% probably more important to exit quickly. exit(Reason); - {channel_unexpected_exit, E = {writer, send_failed, _Error}} -> + {channel_exit, _Chan, E = {writer, send_failed, _Error}} -> throw(E); {channel_exit, Channel, Reason} -> mainloop(Parent, Deb, handle_channel_exit(Channel, Reason, State)); |