summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-08-27 11:11:18 +0100
committerMatthew Sackman <matthew@lshift.net>2009-08-27 11:11:18 +0100
commit9577456310849f81d03ac7be111879bb40f8373a (patch)
tree47ebe167b385655b5f5ae85f8f1d41c186e20cd7
parent6ac9ab5f7d6ae13b1aacca6e26f92429bcd2e024 (diff)
downloadrabbitmq-server-git-9577456310849f81d03ac7be111879bb40f8373a.tar.gz
and of course the run length encoding should not include the marker message.
-rw-r--r--src/rabbit_mixed_queue.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_mixed_queue.erl b/src/rabbit_mixed_queue.erl
index 355fb1fc04..0aa1b54263 100644
--- a/src/rabbit_mixed_queue.erl
+++ b/src/rabbit_mixed_queue.erl
@@ -103,7 +103,6 @@
init(Queue, IsDurable) ->
Len = rabbit_disk_queue:len(Queue),
- MsgBuf = inc_queue_length(queue:new(), Len),
{Size, MarkerFound, MarkerCount} = rabbit_disk_queue:foldl(
fun (Msg = #basic_message { is_persistent = true },
_AckTag, _IsDelivered, {SizeAcc, MFound, MCount}) ->
@@ -122,6 +121,7 @@ init(Queue, IsDurable) ->
{ok, Len2} = fetch_ack_magic_marker_message(Queue),
Len2
end,
+ MsgBuf = inc_queue_length(queue:new(), Len1),
{ok, #mqstate { mode = disk, msg_buf = MsgBuf, queue = Queue,
is_durable = IsDurable, length = Len1,
memory_size = Size, memory_gain = undefined,