diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2013-07-01 15:01:52 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2013-07-01 15:01:52 +0100 |
| commit | 367e0da95c0d7004651e3ed49944a47561d0edbf (patch) | |
| tree | 39426271d0776272bf36e8d5239eec63aca49957 | |
| parent | 66ba54bc346a140ed9b1a1a8ba78653518286b9a (diff) | |
| download | rabbitmq-server-git-367e0da95c0d7004651e3ed49944a47561d0edbf.tar.gz | |
Correction and contraction
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_master.erl | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 0d8d6e293c..c17f8460e4 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -555,9 +555,9 @@ attempt_delivery(Delivery = #delivery{sender = SenderPid, {discarded, BQS1} -> State1 = State#q{backing_queue_state = BQS1}, {true, case MsgSeqNo of - undefined -> State; + undefined -> State1; _ -> #basic_message{id = MsgId} = Message, - confirm_messages([MsgId], State) + confirm_messages([MsgId], State1) end} end. diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl index 8c061e52fc..f1798f5d40 100644 --- a/src/rabbit_mirror_queue_master.erl +++ b/src/rabbit_mirror_queue_master.erl @@ -227,9 +227,8 @@ discard(MsgId, ChPid, State = #state { gm = GM, seen_status = SS }) -> false = dict:is_key(MsgId, SS), %% ASSERTION ok = gm:broadcast(GM, {discard, ChPid, MsgId}), - State1 = State #state { backing_queue_state = - BQ:discard(MsgId, ChPid, BQS) }, - ensure_monitoring(ChPid, State1). + ensure_monitoring(ChPid, State #state { backing_queue_state = + BQ:discard(MsgId, ChPid, BQS) }. dropwhile(Pred, State = #state{backing_queue = BQ, backing_queue_state = BQS }) -> |