summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Mazzoli <francesco@rabbitmq.com>2012-08-31 18:40:05 +0100
committerFrancesco Mazzoli <francesco@rabbitmq.com>2012-08-31 18:40:05 +0100
commit24dc3a1f66e1dc0661c02532a84bb9e5d4d354cf (patch)
tree1c05e71d74941c6d38c28e32284dfa16e7f3e85b
parent3e464a656425438308529f5d1decd42da5060f0f (diff)
downloadrabbitmq-server-24dc3a1f66e1dc0661c02532a84bb9e5d4d354cf.tar.gz
use `set_synchronized' instead than manually increasing
-rw-r--r--src/rabbit_mirror_queue_slave.erl8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl
index 75c88b15..d79067be 100644
--- a/src/rabbit_mirror_queue_slave.erl
+++ b/src/rabbit_mirror_queue_slave.erl
@@ -833,8 +833,7 @@ process_instruction({set_length, Length, Dropped, AckRequired},
end};
process_instruction({fetch, AckRequired, MsgId, Remaining},
State = #state { backing_queue = BQ,
- backing_queue_state = BQS,
- external_pending = ExtPending }) ->
+ backing_queue_state = BQS }) ->
QLen = BQ:len(BQS),
{ok, case {QLen - 1, AckRequired} of
{Remaining, _} ->
@@ -845,10 +844,7 @@ process_instruction({fetch, AckRequired, MsgId, Remaining},
{_, false} when QLen =< Remaining ->
set_synchronised(Remaining, State);
{_, true} when QLen =< Remaining ->
- State #state { external_pending = case ExtPending of
- undefined -> undefined;
- _ -> ExtPending + 1
- end }
+ set_synchronised(1, Remaining, State)
end};
process_instruction({ack, MsgIds, Length},
State = #state { backing_queue = BQ,