summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-09-27 14:58:11 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2012-09-27 14:58:11 +0100
commit2eceee754f95301eca78f12a1f33f20b3206f0cc (patch)
tree4ea3e55d12e43e03cc479f14cd9a200ad4a12068
parent7839b217164b9a9f089fed001253c74d8c0954cf (diff)
downloadrabbitmq-server-bug25185.tar.gz
undo spurious changebug25185
-rw-r--r--src/rabbit_mirror_queue_slave.erl3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl
index cc41ac01..039b2749 100644
--- a/src/rabbit_mirror_queue_slave.erl
+++ b/src/rabbit_mirror_queue_slave.erl
@@ -536,8 +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 ||
- {_ChPid, {PubQ, _PendCh}} <- dict:to_list(SQ),
+ Deliveries = [Delivery || {_ChPid, {PubQ, _PendCh}} <- dict:to_list(SQ),
Delivery <- queue:to_list(PubQ)],
QueueState = rabbit_amqqueue_process:init_with_backing_queue_state(
Q1, rabbit_mirror_queue_master, MasterState, RateTRef,