diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-07-06 14:33:40 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-07-06 14:33:40 +0100 |
| commit | 0b859264b024da4f3899fc9d8fb0bf8884afc713 (patch) | |
| tree | b11c3e022dd917c0705ada781f65fcef6dd074ef | |
| parent | c8e59dadcc63416e11b1f14f8d414032d65a5c2b (diff) | |
| parent | 877b428bbe8c70510a26b2c583da35cc32226334 (diff) | |
| download | rabbitmq-server-0b859264b024da4f3899fc9d8fb0bf8884afc713.tar.gz | |
merge default into bug21673
| -rw-r--r-- | src/rabbit_amqqueue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_exchange.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_writer.erl | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index b6084519..1d1ccef7 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. diff --git a/src/rabbit_writer.erl b/src/rabbit_writer.erl index 3d10dc12..233d7291 100644 --- a/src/rabbit_writer.erl +++ b/src/rabbit_writer.erl @@ -149,6 +149,7 @@ send_command_and_notify(W, Q, ChPid, MethodRecord, Content) -> shutdown(W) -> W ! shutdown, + rabbit_misc:unlink_and_capture_exit(W), ok. %--------------------------------------------------------------------------- |