diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-09-27 12:15:16 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-09-27 12:15:16 +0100 |
| commit | 009d7a377a3841faceac1cab53ecf06fd6082fd3 (patch) | |
| tree | 5899a3d106b156df1adcd65a98142f2ec62ef660 | |
| parent | e264fb9476ed2d7b9e01006187f56f9f70b849ad (diff) | |
| download | rabbitmq-server-git-009d7a377a3841faceac1cab53ecf06fd6082fd3.tar.gz | |
Don't change the signature of init_with_backing_queue_state
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 3bf291e798..487c06b763 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -78,7 +78,7 @@ -spec(info_keys/0 :: () -> rabbit_types:info_keys()). -spec(init_with_backing_queue_state/8 :: (rabbit_types:amqqueue(), atom(), tuple(), any(), [any()], - [{rabbit_types:delivery(), boolean()}], pmon:pmon(), dict()) -> #q{}). + [rabbit_types:delivery()], pmon:pmon(), dict()) -> #q{}). -endif. @@ -170,8 +170,8 @@ init_with_backing_queue_state(Q = #amqqueue{exclusive_owner = Owner}, BQ, BQS, rabbit_event:init_stats_timer( State, #q.stats_timer))), lists:foldl( - fun ({Delivery, Redelivered}, StateN) -> - deliver_or_enqueue(Delivery, Redelivered, StateN) + fun (Delivery, StateN) -> + deliver_or_enqueue(Delivery, true, StateN) end, State1, Deliveries). diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index 1e10e8a93e..cc41ac0194 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -536,7 +536,7 @@ promote_me(From, #state { q = Q = #amqqueue { name = QName }, end, gb_trees:empty(), MSList), NumAckTags = [NumAckTag || {_MsgId, NumAckTag} <- dict:to_list(MA)], AckTags = [AckTag || {_Num, AckTag} <- lists:sort(NumAckTags)], - Deliveries = [{Delivery, true} || + Deliveries = [Delivery || {_ChPid, {PubQ, _PendCh}} <- dict:to_list(SQ), Delivery <- queue:to_list(PubQ)], QueueState = rabbit_amqqueue_process:init_with_backing_queue_state( |