diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-09 15:12:48 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-09 15:12:48 +0000 |
| commit | 1de9cb76aa9682a66c3ec59136b02953178ea328 (patch) | |
| tree | e1f7bcda3fb7a7bde0a57bf02f5493bd294c6353 | |
| parent | 99cd6f58f940e6627a86d507674be1830d75cb4d (diff) | |
| download | rabbitmq-server-git-1de9cb76aa9682a66c3ec59136b02953178ea328.tar.gz | |
fix
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index 68dd50e21c..1a23988016 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -501,9 +501,10 @@ process_instruction( case queue:out(MQ) of {empty, _MQ} -> {SQ, MS1}; - {{value, Delivery = #delivery { - msg_seq_no = MsgSeqNo, - message = #basic_message { id = MsgId } }}, + {{value, {Delivery = #delivery { + msg_seq_no = MsgSeqNo, + message = #basic_message { id = MsgId } }, + _EnqueueOnPromotion}}, MQ1} -> %% We received the msg from the channel %% first. Thus we need to deal with confirms @@ -519,7 +520,7 @@ process_instruction( ok = rabbit_channel:confirm(ChPid, [MsgSeqNo]), MS end}; - {{value, #delivery {}}, _MQ1} -> + {{value, {#delivery {}, _EnqueueOnPromotion}}, _MQ1} -> %% The instruction was sent to us before we %% were within the mirror_pids within the %% #amqqueue{} record. We'll never receive the |