diff options
| author | Vlad Alexandru Ionescu <vlad@rabbitmq.com> | 2010-10-11 18:30:48 +0100 |
|---|---|---|
| committer | Vlad Alexandru Ionescu <vlad@rabbitmq.com> | 2010-10-11 18:30:48 +0100 |
| commit | f9de69052c488b8f5219e5c379c1f85e2d8064ab (patch) | |
| tree | c7cef4f0ebb0d3253af2c3baeb33d24097332924 | |
| parent | a131c276c4e2963ed3652a072acf128fcbeb808f (diff) | |
| download | rabbitmq-server-bug22180.tar.gz | |
or should be orelse; cosmeticbug22180
| -rw-r--r-- | src/rabbit_binary_generator.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/rabbit_binary_generator.erl b/src/rabbit_binary_generator.erl index 5f97d6a8..722573c7 100644 --- a/src/rabbit_binary_generator.erl +++ b/src/rabbit_binary_generator.erl @@ -315,18 +315,18 @@ clear_encoded_content(Content = #content{}) -> map_exception(Channel, Reason, Protocol) -> {SuggestedClose, ReplyCode, ReplyText, FailedMethod} = lookup_amqp_exception(Reason, Protocol), - ShouldClose = SuggestedClose or (Channel == 0), + ShouldClose = SuggestedClose orelse (Channel == 0), {ClassId, MethodId} = case FailedMethod of {_, _} -> FailedMethod; - none -> {0, 0}; - _ -> Protocol:method_id(FailedMethod) + none -> {0, 0}; + _ -> Protocol:method_id(FailedMethod) end, {CloseChannel, CloseMethod} = case ShouldClose of - true -> {0, #'connection.close'{reply_code = ReplyCode, - reply_text = ReplyText, - class_id = ClassId, - method_id = MethodId}}; + true -> {0, #'connection.close'{reply_code = ReplyCode, + reply_text = ReplyText, + class_id = ClassId, + method_id = MethodId}}; false -> {Channel, #'channel.close'{reply_code = ReplyCode, reply_text = ReplyText, class_id = ClassId, |