diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2013-07-31 17:39:37 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2013-07-31 17:39:37 +0100 |
| commit | 50f5b407b29a01c06e05e4fa7c89015d2d015beb (patch) | |
| tree | cccdcc02934676c0c1e089c07feaa850cc460a6a /src | |
| parent | 7c38f773bd38a3fd939df570c565eec0ad07cd0d (diff) | |
| download | rabbitmq-server-git-50f5b407b29a01c06e05e4fa7c89015d2d015beb.tar.gz | |
Check dlx type while checking permissions
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 1 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index a6181a9522..23242a547c 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -412,7 +412,6 @@ check_declare_arguments(QueueName, Args) -> args() -> [{<<"x-expires">>, fun check_expires_arg/2}, {<<"x-message-ttl">>, fun check_message_ttl_arg/2}, - {<<"x-dead-letter-exchange">>, fun check_string_arg/2}, {<<"x-dead-letter-routing-key">>, fun check_dlxrk_arg/2}, {<<"x-max-length">>, fun check_max_length_arg/2}]. diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 3df1387615..be9d2712db 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -370,7 +370,9 @@ r_arg(#resource{virtual_host = VHostPath}, Kind, Table, Key) -> r_arg(VHostPath, Kind, Table, Key) -> case table_lookup(Table, Key) of {longstr, NameBin} -> r(VHostPath, Kind, NameBin); - undefined -> undefined + undefined -> undefined; + Other -> protocol_error(precondition_failed, + "invalid arg: ~p", [Other]) end. rs(#resource{virtual_host = VHostPath, kind = Kind, name = Name}) -> |