diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-12-13 12:08:46 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-12-13 12:08:46 +0000 |
| commit | 4997583d3eaaaa34f49781cb50ae2a1c5b506383 (patch) | |
| tree | 97f4ba312f50ba012179f9fd6423363e93e614f1 | |
| parent | 7612daef19ac6393b5b8db3cc7980ec43d92b340 (diff) | |
| download | rabbitmq-server-4997583d3eaaaa34f49781cb50ae2a1c5b506383.tar.gz | |
Cosmetics.
| -rw-r--r-- | src/rabbit_channel.erl | 16 | ||||
| -rw-r--r-- | src/rabbit_exchange.erl | 9 |
2 files changed, 10 insertions, 15 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 25f88a1b..162a62fa 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -399,16 +399,12 @@ check_write_permitted(Resource, #ch{username = Username}) -> check_read_permitted(Resource, #ch{username = Username}) -> check_resource_access(Username, Resource, read). -check_internal_exchange(#exchange{name = Name, - internal = IsInternal}) -> - case IsInternal of - true -> - rabbit_misc:protocol_error(access_refused, - "cannot publish to internal exchange: " - ++ "~p~n", - [Name]); - false -> ok - end. +check_internal_exchange(#exchange{name = Name, internal = true}) -> + rabbit_misc:protocol_error(access_refused, + "cannot publish to internal exchange: ~p~n", + [Name]); +check_internal_exchange(_) -> + ok. expand_queue_name_shortcut(<<>>, #ch{most_recently_declared_queue = <<>>}) -> rabbit_misc:protocol_error( diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 01e962d5..501af585 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -176,13 +176,12 @@ assert_equivalence(X = #exchange{ durable = Durable, type = Type}, Type, Durable, AutoDelete, Internal, RequiredArgs) -> (type_to_module(Type)):assert_args_equivalence(X, RequiredArgs); -assert_equivalence(#exchange{ name = Name }, - _Type, _Durable, _Internal, _AutoDelete, - _Args) -> +assert_equivalence(#exchange{ name = Name }, + _Type, _Durable, _Internal, _AutoDelete, _Args) -> rabbit_misc:protocol_error( precondition_failed, - "cannot redeclare ~s with different type, durable, " ++ - "internal or autodelete value", + "cannot redeclare ~s with different type, durable, " + "internal or autodelete value", [rabbit_misc:rs(Name)]). assert_args_equivalence(#exchange{ name = Name, arguments = Args }, |