diff options
| author | Simon MacMullen <simon@lshift.net> | 2010-05-26 17:03:54 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@lshift.net> | 2010-05-26 17:03:54 +0100 |
| commit | dab9c1fcdb0c8056ae2d784e5eb3a56cb3c7e8aa (patch) | |
| tree | 11fb2c7e58c3cab2644e46d57ed451c5f922fa99 | |
| parent | 163da66fe3fb4eeddff74dbb0f9f031032ef9c90 (diff) | |
| download | rabbitmq-server-dab9c1fcdb0c8056ae2d784e5eb3a56cb3c7e8aa.tar.gz | |
Clean up a bit.
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index e8a74572..a176dc46 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -646,8 +646,8 @@ handle_call({basic_consume, NoAck, ChPid, LimiterPid, store_ch_record(C#cr{consumer_count = ConsumerCount +1, limiter_pid = LimiterPid}), ok = case ConsumerCount of - 0 -> rabbit_limiter:register(LimiterPid, self()); - _ -> ok + 0 -> rabbit_limiter:register(LimiterPid, self()); + _ -> ok end, ExclusiveConsumer = if ExclusiveConsume -> {ChPid, ConsumerTag}; true -> ExistingHolder diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 48eeb40a..3db0f95e 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -715,16 +715,10 @@ handle_method(#'queue.declare'{queue = QueueNameBin, check_configure_permitted(QueueName, State), Matched; %% exclusivity trumps non-equivalence arbitrarily - #amqqueue{name = QueueName, - exclusive_owner = ExclusiveOwner} - when ExclusiveOwner =/= Owner -> + #amqqueue{name = QueueName} -> rabbit_misc:protocol_error( resource_locked, "cannot obtain exclusive access to locked ~s", - [rabbit_misc:rs(QueueName)]); - #amqqueue{name = QueueName} -> - rabbit_misc:protocol_error( - channel_error, "parameters for ~s not equivalent", [rabbit_misc:rs(QueueName)]) end end, |