diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-10-23 20:42:16 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-10-23 20:42:16 +0100 |
| commit | 1c834a9242479ff6b48d7377483bf23ef5e0ea36 (patch) | |
| tree | fdbc9617a43b13c06a23b871319efc7fc6a0f607 | |
| parent | 2436b4d1c4c653c09beb7701177b1524c4b81d49 (diff) | |
| parent | 216d967f6afce95f52316c98a78e0b8b1ce9f458 (diff) | |
| download | rabbitmq-server-git-1c834a9242479ff6b48d7377483bf23ef5e0ea36.tar.gz | |
merge default into bug23408
| -rw-r--r-- | src/rabbit_variable_queue.erl | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index ceb0ed063d..91299ed639 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -550,23 +550,21 @@ read_msg(MsgStatus = #msg_status { msg = undefined, read_msg(MsgStatus, State) -> {MsgStatus, State}. -internal_fetch(AckRequired, - MsgStatus = #msg_status { - seq_id = SeqId, - guid = Guid, - msg = Msg, - is_persistent = IsPersistent, - is_delivered = IsDelivered, - msg_on_disk = MsgOnDisk, - index_on_disk = IndexOnDisk }, - State = #vqstate { - ram_msg_count = RamMsgCount, - out_counter = OutCount, - index_state = IndexState, - msg_store_clients = MSCState, - len = Len, - persistent_count = PCount, - pending_ack = PA }) -> +internal_fetch(AckRequired, MsgStatus = #msg_status { + seq_id = SeqId, + guid = Guid, + msg = Msg, + is_persistent = IsPersistent, + is_delivered = IsDelivered, + msg_on_disk = MsgOnDisk, + index_on_disk = IndexOnDisk }, + State = #vqstate {ram_msg_count = RamMsgCount, + out_counter = OutCount, + index_state = IndexState, + msg_store_clients = MSCState, + len = Len, + persistent_count = PCount, + pending_ack = PA }) -> %% 1. Mark it delivered if necessary IndexState1 = maybe_write_delivered( IndexOnDisk andalso not IsDelivered, |