diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-08-03 12:17:20 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-08-03 12:17:20 +0100 |
| commit | 51811f3b5e72d5c7752bb3760c0b008aa6fd0e17 (patch) | |
| tree | 8aefd037425d97c07d90ae7c03cacfa291320466 | |
| parent | 10bc8267622f8f07e744d2ae3c5281d6c19a2353 (diff) | |
| download | rabbitmq-server-51811f3b5e72d5c7752bb3760c0b008aa6fd0e17.tar.gz | |
rabbit_exchange:type_to_module/1 no longer throws protocol errors
| -rw-r--r-- | src/rabbit_exchange.erl | 16 | ||||
| -rw-r--r-- | src/vm_memory_monitor.erl | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 75154388..91a36cc7 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -208,12 +208,8 @@ declare(ExchangeName, Type, Durable, AutoDelete, Args) -> %% Used with atoms from records; e.g., the type is expected to exist. type_to_module(T) -> - case rabbit_exchange_type_registry:lookup_module(T) of - {ok, Module} -> Module; - {error, not_found} -> rabbit_misc:protocol_error( - command_invalid, - "invalid exchange type '~s'", [T]) - end. + {ok, Module} = rabbit_exchange_type_registry:lookup_module(T), + Module. %% Used with binaries sent over the wire; the type may not exist. check_type(TypeBin) -> @@ -222,8 +218,12 @@ check_type(TypeBin) -> rabbit_misc:protocol_error( command_invalid, "unknown exchange type '~s'", [TypeBin]); T -> - _Module = type_to_module(T), - T + case rabbit_exchange_type_registry:lookup_module(T) of + {error, not_found} -> rabbit_misc:protocol_error( + command_invalid, + "invalid exchange type '~s'", [T]); + {ok, Module} -> T + end end. assert_equivalence(X = #exchange{ durable = Durable, diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl index bbc3a8c0..3cbc80f8 100644 --- a/src/vm_memory_monitor.erl +++ b/src/vm_memory_monitor.erl @@ -78,7 +78,7 @@ rabbit_types:ok(pid())). -spec(update/0 :: () -> 'ok'). -spec(get_total_memory/0 :: () -> (non_neg_integer() | 'unknown')). --spec(get_vm_limit/0 :: () -> (non_neg_integer() | 'unknown')). +-spec(get_vm_limit/0 :: () -> non_neg_integer()). -spec(get_memory_limit/0 :: () -> (non_neg_integer() | 'undefined')). -spec(get_check_interval/0 :: () -> non_neg_integer()). -spec(set_check_interval/1 :: (non_neg_integer()) -> 'ok'). |