summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-11-28 10:24:01 +0000
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-11-28 10:24:01 +0000
commit82d1942f9ab7809ccdb331e1ea5343b031131edd (patch)
tree016715c16c49119b4e3aa4cbd6468f3a99ac5332
parente041f9d892a3250acb273dccfb365693456a4fcc (diff)
downloadrabbitmq-server-git-82d1942f9ab7809ccdb331e1ea5343b031131edd.tar.gz
don't check dlx on queue.declare
-rw-r--r--src/rabbit_amqqueue.erl8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 108e57082b..041f0b4a23 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -345,15 +345,13 @@ check_integer_argument({_Type, Val}, _Args, _VHostPath) ->
check_exchange_argument(undefined, _Args, _VHostPath) ->
ok;
check_exchange_argument({longstr, Val}, _Args, VHostPath) ->
- case rabbit_exchange:lookup(rabbit_misc:r(VHostPath, exchange, Val)) of
- {ok, _Exchange} -> ok;
- {error, not_found} -> {error, {non_existent_exchange, Val}}
+ try rabbit_misc:r(VHostPath, exchange, Val)
+ of _Exchange -> ok
+ catch _:_ -> {error, {invalid_exchange_name, Val}}
end;
check_exchange_argument({Type, _Val}, _Args, _VHostPath) ->
{error, {unacceptable_type, Type}}.
-
-
check_ha_policy_argument(undefined, _Args, _VHostPath) ->
ok;
check_ha_policy_argument({longstr, <<"all">>}, _Args, _VHostPath) ->