summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-12-19 12:10:21 +0000
committerSimon MacMullen <simon@rabbitmq.com>2013-12-19 12:10:21 +0000
commit98c71377de09f2183bce30aa780b1242f8955504 (patch)
tree4ce1f396f956fe1c54a6a45b3bd6c58af1b732b2
parent6c8e13f5d57f5ebac9937ca9110823bbe71d3368 (diff)
downloadrabbitmq-server-98c71377de09f2183bce30aa780b1242f8955504.tar.gz
Keep the two handle_exception()s together.
-rw-r--r--src/rabbit_reader.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 32629235..52127300 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})