diff options
| author | Essien Ita Essien <essiene@gmail.com> | 2008-12-28 23:57:02 +0100 |
|---|---|---|
| committer | Essien Ita Essien <essiene@gmail.com> | 2008-12-28 23:57:02 +0100 |
| commit | cd054d71626519e587d6181309063742579fd19f (patch) | |
| tree | 37286db905e71b6da2446b1dc3b9b19669c293ad /src | |
| parent | 2955e19dfa2950d165e046ba3fea79ab4c3bd608 (diff) | |
| parent | 69957f6f24f98fb0ad264599b47ca6c71ebb38b8 (diff) | |
| download | rabbitmq-server-git-cd054d71626519e587d6181309063742579fd19f.tar.gz | |
Merge with upstream
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_channel.erl | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 19104bcb90..ca2782c77d 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -111,16 +111,14 @@ init(ProxyPid, [ReaderPid, WriterPid, Username, VHost]) -> consumer_mapping = dict:new()}. handle_message({method, Method, Content}, State) -> - try - case handle_method(Method, Content, State) of - {reply, Reply, NewState} -> - ok = rabbit_writer:send_command(NewState#ch.writer_pid, Reply), - NewState; - {noreply, NewState} -> - NewState; - stop -> - exit(normal) - end + try handle_method(Method, Content, State) of + {reply, Reply, NewState} -> + ok = rabbit_writer:send_command(NewState#ch.writer_pid, Reply), + NewState; + {noreply, NewState} -> + NewState; + stop -> + exit(normal) catch exit:{amqp, Error, Explanation, none} -> terminate({amqp, Error, Explanation, |