From 95b7cce4bee12d5db53874c5fd54ce3ea4c19a3d Mon Sep 17 00:00:00 2001
From: Simon MacMullen <simon@rabbitmq.com>
Date: Mon, 28 Jul 2014 14:00:39 +0100
Subject: The expectation is we will only return details for persistent
 messages here.

---
 src/rabbit_queue_index.erl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl
index 322c0f8a..08c81a94 100644
--- a/src/rabbit_queue_index.erl
+++ b/src/rabbit_queue_index.erl
@@ -471,11 +471,14 @@ recover_segment(ContainsCheckFun, CleanShutdown,
     {SegEntries1, UnackedCountDelta} =
         segment_plus_journal(SegEntries, JEntries),
     array:sparse_foldl(
-      fun (RelSeq, {{MsgId, MsgProps, _IsPersistent}, Del, no_ack},
+      fun (RelSeq, {{MsgId, MsgProps, IsPersistent}, Del, no_ack},
            {SegmentAndDirtyCount, Bytes}) ->
               {recover_message(ContainsCheckFun(MsgId), CleanShutdown,
                                Del, RelSeq, SegmentAndDirtyCount),
-               Bytes + MsgProps#message_properties.size}
+               Bytes + case IsPersistent of
+                           true  -> MsgProps#message_properties.size;
+                           false -> 0
+                       end}
       end,
       {{Segment #segment { unacked = UnackedCount + UnackedCountDelta }, 0}, 0},
       SegEntries1).
-- 
cgit v1.2.1