summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-06-10 11:41:22 +0100
committerMatthias Radestock <matthias@lshift.net>2009-06-10 11:41:22 +0100
commit50827e5bf8d35a2cf4c1b9bc77a4b3a69769f29f (patch)
tree46db0379c5ac7a75d5ca7af71a9c590ae82d08a3 /src
parent4a9485fc3bd605b21686dce9e8858aa3e8c3e977 (diff)
downloadrabbitmq-server-git-50827e5bf8d35a2cf4c1b9bc77a4b3a69769f29f.tar.gz
cosmetic
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_amqqueue_process.erl16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 7ffb1c8f25..67cd7d76b7 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -630,7 +630,8 @@ handle_call({basic_consume, NoAck, ReaderPid, ChPid, LimiterPid,
reply({error, exclusive_consume_unavailable}, State);
ok ->
C = #cr{consumers = Consumers} = ch_record(ChPid),
- Consumer = #consumer{tag = ConsumerTag, ack_required = not(NoAck)},
+ Consumer = #consumer{tag = ConsumerTag,
+ ack_required = not(NoAck)},
store_ch_record(C#cr{consumers = [Consumer | Consumers],
limiter_pid = LimiterPid}),
if Consumers == [] ->
@@ -638,13 +639,14 @@ handle_call({basic_consume, NoAck, ReaderPid, ChPid, LimiterPid,
true ->
ok
end,
+ ExclusiveConsumer =
+ if ExclusiveConsume -> {ChPid, ConsumerTag};
+ true -> ExistingHolder
+ end,
State1 = State#q{has_had_consumers = true,
- exclusive_consumer =
- if
- ExclusiveConsume -> {ChPid, ConsumerTag};
- true -> ExistingHolder
- end,
- round_robin = queue:in({ChPid, Consumer}, RoundRobin)},
+ exclusive_consumer = ExclusiveConsumer,
+ round_robin = queue:in({ChPid, Consumer},
+ RoundRobin)},
ok = maybe_send_reply(ChPid, OkMsg),
reply(ok, run_poke_burst(State1))
end