diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2010-11-23 17:51:10 +0000 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2010-11-23 17:51:10 +0000 |
| commit | 0bebfc360997826ba7b532aaba140aab44951d03 (patch) | |
| tree | f477a1ec120205b22f2ffecd2697ae8d01ed73cb | |
| parent | ebb6e53b9908c78258ae1c0e50c51693856b191e (diff) | |
| parent | 58c2ff376a46979e742cc7382844e69e532b6e20 (diff) | |
| download | rabbitmq-server-git-0bebfc360997826ba7b532aaba140aab44951d03.tar.gz | |
Merged bug23494 into default
| -rw-r--r-- | src/rabbit_amqqueue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_exchange.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 5cdd0e3cb2..fa4175441b 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -279,7 +279,7 @@ assert_equivalence(#amqqueue{durable = Durable, assert_equivalence(#amqqueue{name = QueueName}, _Durable, _AutoDelete, _RequiredArgs, _Owner) -> rabbit_misc:protocol_error( - not_allowed, "parameters for ~s not equivalent", + precondition_failed, "parameters for ~s not equivalent", [rabbit_misc:rs(QueueName)]). check_exclusive_access(Q, Owner) -> check_exclusive_access(Q, Owner, lax). diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 4c0f341ffc..00e479a261 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -176,7 +176,7 @@ assert_equivalence(X = #exchange{ durable = Durable, assert_equivalence(#exchange{ name = Name }, _Type, _Durable, _AutoDelete, _Args) -> rabbit_misc:protocol_error( - not_allowed, + precondition_failed, "cannot redeclare ~s with different type, durable or autodelete value", [rabbit_misc:rs(Name)]). diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 230f4db524..1e6ad8d884 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -242,7 +242,7 @@ assert_args_equivalence1(Orig, New, Name, Key) -> case {table_lookup(Orig, Key), table_lookup(New, Key)} of {Same, Same} -> ok; {Orig1, New1} -> protocol_error( - not_allowed, + precondition_failed, "inequivalent arg '~s' for ~s: " "required ~w, received ~w", [Key, rabbit_misc:rs(Name), New1, Orig1]) |