From 58787c964e568f363915844ee54f19b2b0f80940 Mon Sep 17 00:00:00 2001
From: "Carl C. Trieloff" <cctrieloff@apache.org>
Date: Tue, 6 Nov 2007 19:43:54 +0000
Subject: - clean up between base & subclasses

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@592530 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/broker/Message.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'cpp/src/qpid/broker/Message.cpp')

diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp
index 5d572283ce..78d6cd3891 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/cpp/src/qpid/broker/Message.cpp
@@ -36,7 +36,7 @@ using std::string;
 TransferAdapter Message::TRANSFER;
 PublishAdapter Message::PUBLISH;
 
-Message::Message(const SequenceNumber& id) : frames(id), persistenceId(0), redelivered(false), publisher(0), store(0), adapter(0) {}
+Message::Message(const SequenceNumber& id) : frames(id), persistenceId(0), redelivered(false), publisher(0), adapter(0) {}
 
 std::string Message::getRoutingKey() const
 {
@@ -131,12 +131,15 @@ void Message::decodeContent(framing::Buffer& buffer)
 
 void Message::releaseContent(MessageStore* _store)
 {
-    store = _store;
+    if (!store){
+		store = _store;
+	}
     if (!getPersistenceId()) {
         store->stage(*this);
     }
     //remove any content frames from the frameset
     frames.remove(TypeFilter(CONTENT_BODY));
+    setContentReleased();
 }
 
 void Message::sendContent(framing::FrameHandler& out, uint16_t maxFrameSize) const
-- 
cgit v1.2.1