diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-12-19 12:10:21 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-12-19 12:10:21 +0000 |
| commit | d8f0de1b1d49b95f3aa28f743c8a13f86a3201c8 (patch) | |
| tree | 4ce1f396f956fe1c54a6a45b3bd6c58af1b732b2 | |
| parent | 421ce43b4588d2902dcff3e79ef0cd37082958f8 (diff) | |
| download | rabbitmq-server-git-d8f0de1b1d49b95f3aa28f743c8a13f86a3201c8.tar.gz | |
Keep the two handle_exception()s together.
| -rw-r--r-- | src/rabbit_reader.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 3262923556..52127300d5 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -806,11 +806,11 @@ handle_method0(MethodName, FieldsBin, try handle_method0(Protocol:decode_method_fields(MethodName, FieldsBin), State) - catch exit:#amqp_error{method = none} = Reason -> - handle_exception(State, 0, Reason#amqp_error{method = MethodName}); - throw:{writer_inet_error, closed} -> + catch throw:{writer_inet_error, closed} -> maybe_emit_stats(State), throw(connection_closed_abruptly); + exit:#amqp_error{method = none} = Reason -> + handle_exception(State, 0, Reason#amqp_error{method = MethodName}); Type:Reason -> Stack = erlang:get_stacktrace(), handle_exception(State, 0, {Type, Reason, MethodName, Stack}) |
