summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2011-05-19 15:57:43 +0100
committerMatthew Sackman <matthew@rabbitmq.com>2011-05-19 15:57:43 +0100
commit457221a521edfce0b1599b1d403cd21aa4a56387 (patch)
treefd71947c34c2f4766b64c0ffd0ad57f434aadd19
parentb04866828c7275079cb32ebda7098782bb9774f7 (diff)
downloadrabbitmq-server-git-457221a521edfce0b1599b1d403cd21aa4a56387.tar.gz
Be more assertive. Slave is the equiv of amqqueue_process, so it's ok here to know the message is actually a #basic_message and thus contains an id which can be matched against
-rw-r--r--src/rabbit_mirror_queue_slave.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl
index 422b0d5902..da01e0764b 100644
--- a/src/rabbit_mirror_queue_slave.erl
+++ b/src/rabbit_mirror_queue_slave.erl
@@ -707,8 +707,8 @@ process_instruction({fetch, AckRequired, MsgId, Remaining},
QLen = BQ:len(BQS),
{ok, case QLen - 1 of
Remaining ->
- {{_Msg, _IsDelivered, AckTag, Remaining}, BQS1} =
- BQ:fetch(AckRequired, BQS),
+ {{#basic_message{id = MsgId}, _IsDelivered,
+ AckTag, Remaining}, BQS1} = BQ:fetch(AckRequired, BQS),
maybe_store_ack(AckRequired, MsgId, AckTag,
State #state { backing_queue_state = BQS1 });
Other when Other < Remaining ->