summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2013-08-05 15:02:09 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2013-08-05 15:02:09 +0100
commitd081e9ff99b4caf59f128f940a7e76559c59f19f (patch)
tree8b527e260637bb69e3a7db57de5aaad4fa71c42d
parentf30667732c4012dfb77b5bf8a32e5c0d4e524183 (diff)
downloadrabbitmq-server-d081e9ff99b4caf59f128f940a7e76559c59f19f.tar.gz
simplify
-rw-r--r--src/rabbit_channel.erl10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 0aeaa96b..d6c1e8c0 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -898,8 +898,7 @@ handle_method(#'exchange.declare'{exchange = ExchangeNameBin,
case rabbit_misc:r_arg(VHostPath, exchange, Args, AeKey) of
undefined -> ok;
{error, {invalid_type, Type}} ->
- rabbit_misc:protocol_error(
- precondition_failed,
+ precondition_failed(
"invalid type '~s' for arg '~s' in ~s",
[Type, AeKey, rabbit_misc:rs(ExchangeName)]);
AName -> check_read_permitted(ExchangeName, State),
@@ -996,10 +995,9 @@ handle_method(#'queue.declare'{queue = QueueNameBin,
undefined ->
ok;
{error, {invalid_type, Type}} ->
- rabbit_misc:protocol_error(
- precondition_failed,
- "invalid type '~s' for arg '~s' in ~s",
- [Type, DlxKey, rabbit_misc:rs(QueueName)]);
+ precondition_failed(
+ "invalid type '~s' for arg '~s' in ~s",
+ [Type, DlxKey, rabbit_misc:rs(QueueName)]);
DLX ->
check_read_permitted(QueueName, State),
check_write_permitted(DLX, State),