diff options
Diffstat (limited to 'cpp/lib/broker')
| -rw-r--r-- | cpp/lib/broker/BrokerQueue.cpp | 2 | ||||
| -rw-r--r-- | cpp/lib/broker/InMemoryContent.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cpp/lib/broker/BrokerQueue.cpp b/cpp/lib/broker/BrokerQueue.cpp index bfea1918a4..0e48d3b13d 100644 --- a/cpp/lib/broker/BrokerQueue.cpp +++ b/cpp/lib/broker/BrokerQueue.cpp @@ -65,6 +65,8 @@ void Queue::deliver(Message::shared_ptr& msg){ void Queue::recover(Message::shared_ptr& msg){ push(msg); if (store && msg->expectedContentSize() != msg->encodedContentSize()) { + //content has not been loaded, need to ensure that lazy loading mode is set: + //TODO: find a nicer way to do this msg->releaseContent(store); } } diff --git a/cpp/lib/broker/InMemoryContent.cpp b/cpp/lib/broker/InMemoryContent.cpp index 7205eb3de0..8826b42d2c 100644 --- a/cpp/lib/broker/InMemoryContent.cpp +++ b/cpp/lib/broker/InMemoryContent.cpp @@ -33,8 +33,7 @@ u_int32_t InMemoryContent::size() { int sum(0); for (content_iterator i = content.begin(); i != content.end(); i++) { - sum += (*i)->size() + 8;//8 extra bytes for the frame - //TODO: have to get rid of the frame stuff from encoded data + sum += (*i)->size(); } return sum; } |