summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-12-02 15:15:06 +0000
committerSimon MacMullen <simon@rabbitmq.com>2010-12-02 15:15:06 +0000
commit9cf11642cb7dabe55f147a546dddde191e127189 (patch)
treebf95b60d1ba3118f870423feacd3348849156c10
parent20568d5a3bb331a6bef29bb291f1f5ec617d515a (diff)
downloadrabbitmq-server-9cf11642cb7dabe55f147a546dddde191e127189.tar.gz
Simplify
-rw-r--r--src/rabbit_reader.erl16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index ea7de555..955d0a8a 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -724,18 +724,10 @@ handle_method0(MethodName, FieldsBin,
try
handle_method0(Protocol:decode_method_fields(MethodName, FieldsBin),
State)
- catch exit:Reason ->
- CompleteReason = case Reason of
- #amqp_error{method = none} ->
- Reason#amqp_error{method = MethodName};
- OtherReason -> {exit, OtherReason,
- erlang:get_stacktrace()}
- end,
- HandleException(CompleteReason);
- error:Reason ->
- HandleException({error, Reason, erlang:get_stacktrace()});
- throw:Reason ->
- HandleException({throw, Reason, erlang:get_stacktrace()})
+ catch exit:#amqp_error{method = none} = Reason ->
+ HandleException(Reason#amqp_error{method = MethodName});
+ Type:Reason ->
+ HandleException({Type, Reason, erlang:get_stacktrace()})
end.
handle_method0(#'connection.start_ok'{mechanism = Mechanism,