diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-07-06 10:41:23 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-07-06 10:41:23 +0100 |
| commit | e3cb023a3b58254c5b744b773db60f7944547a23 (patch) | |
| tree | 8f768026f910638db85a1b19731971ac2abd3f64 | |
| parent | c0d2e13e5876a69ad8225614ee055923f6546ca6 (diff) | |
| parent | 8eb081160aebafbed4929398bdf13c05c1559de3 (diff) | |
| download | rabbitmq-server-e3cb023a3b58254c5b744b773db60f7944547a23.tar.gz | |
Merged bug22908 into default.
| -rw-r--r-- | src/rabbit_amqqueue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_exchange.erl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 7b3d793b..9764e368 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -223,7 +223,7 @@ assert_equivalence(#amqqueue{durable = Durable, auto_delete = AutoDelete} = Q, assert_equivalence(#amqqueue{name = QueueName}, _Durable, _AutoDelete, _Args, _Owner) -> rabbit_misc:protocol_error( - precondition_failed, "parameters for ~s not equivalent", + not_allowed, "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 d77bf833..bd9d3d29 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -198,7 +198,7 @@ assert_equivalence(X = #exchange{ durable = Durable, assert_equivalence(#exchange{ name = Name }, _Type, _Durable, _AutoDelete, _Args) -> rabbit_misc:protocol_error( - precondition_failed, + not_allowed, "cannot redeclare ~s with different type, durable or autodelete value", [rabbit_misc:rs(Name)]). @@ -215,7 +215,7 @@ assert_args_equivalence(#exchange{ name = Name, Ae2 = alternate_exchange_value(Args), if Ae1==Ae2 -> ok; true -> rabbit_misc:protocol_error( - precondition_failed, + not_allowed, "cannot redeclare ~s with inequivalent args", [rabbit_misc:rs(Name)]) end. |