summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-12-04 12:01:14 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2012-12-04 12:01:14 +0000
commit89f60604808dbbf7e0d6ea88192bf68e4cafe113 (patch)
tree5edbd6566e84ea85708049593b38fcb89086bec1
parent704bcec128c0f139d536f261ca29c75fa7fba3b7 (diff)
downloadrabbitmq-server-89f60604808dbbf7e0d6ea88192bf68e4cafe113.tar.gz
remove pre-0-9-1 cruft
-rw-r--r--src/rabbit_channel.erl12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index b1ef3b6b..a3c82865 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -529,16 +529,12 @@ check_not_default_exchange(_) ->
%% check that an exchange/queue name does not contain the reserved
%% "amq." prefix.
%%
-%% One, quite reasonable, interpretation of the spec, taken by the
-%% QPid M1 Java client, is that the exclusion of "amq." prefixed names
+%% As per the AMQP 0-9-1 spec, the exclusion of "amq." prefixed names
%% only applies on actual creation, and not in the cases where the
-%% entity already exists. This is how we use this function in the code
-%% below. However, AMQP JIRA 123 changes that in 0-10, and possibly
-%% 0-9SP1, making it illegal to attempt to declare an exchange/queue
-%% with an amq.* name when passive=false. So this will need
-%% revisiting.
+%% entity already exists or passive=true.
%%
-%% TODO: enforce other constraints on name. See AMQP JIRA 69.
+%% NB: We deliberately do not enforce the other constraints on names
+%% required by the spec.
check_name(Kind, NameBin = <<"amq.", _/binary>>) ->
rabbit_misc:protocol_error(
access_refused,