Merged bug22908 into default.

Author: Simon MacMullen

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).

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.