8 files changed, 14 insertions, 14 deletions
diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp
index d03985b15f..030e1ef581 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/cpp/src/qpid/broker/Message.cpp
@@ -139,7 +139,7 @@ void Message::releaseContent(MessageStore* _store)
     frames.remove(TypeFilter(CONTENT_BODY));
 }
 
-void Message::sendContent(framing::FrameHandler& out, uint16_t maxFrameSize)
+void Message::sendContent(framing::FrameHandler& out, uint16_t maxFrameSize) const
 {
     if (isContentReleased()) {
         //load content from store in chunks of maxContentSize
diff --git a/cpp/src/qpid/broker/Message.h b/cpp/src/qpid/broker/Message.h
index dec74586db..ac8e51a030 100644
--- a/cpp/src/qpid/broker/Message.h
+++ b/cpp/src/qpid/broker/Message.h
@@ -114,7 +114,7 @@ public:
      */
     void releaseContent(MessageStore* store);
 
-    void sendContent(framing::FrameHandler& out, uint16_t maxFrameSize);
+    void sendContent(framing::FrameHandler& out, uint16_t maxFrameSize) const;
     void sendHeader(framing::FrameHandler& out, uint16_t maxFrameSize) const;
 
     bool isContentLoaded() const;
diff --git a/cpp/src/qpid/broker/MessageStore.h b/cpp/src/qpid/broker/MessageStore.h
index 303669c6bb..6bd661954f 100644
--- a/cpp/src/qpid/broker/MessageStore.h
+++ b/cpp/src/qpid/broker/MessageStore.h
@@ -89,7 +89,7 @@ public:
     /**
      * Appends content to a previously staged message
      */
-    virtual void appendContent(PersistableMessage& msg, const std::string& data) = 0;
+    virtual void appendContent(const PersistableMessage& msg, const std::string& data) = 0;
     
     /**
      * Loads (a section) of content data for the specified
@@ -99,7 +99,7 @@ public:
      * content should be loaded, not the headers or related
      * meta-data).
      */
-    virtual void loadContent(PersistableMessage& msg, std::string& data, uint64_t offset, uint32_t length) = 0;
+    virtual void loadContent(const PersistableMessage& msg, std::string& data, uint64_t offset, uint32_t length) = 0;
     
     /**
      * Enqueues a message, storing the message if it has not
diff --git a/cpp/src/qpid/broker/MessageStoreModule.cpp b/cpp/src/qpid/broker/MessageStoreModule.cpp
index 7cd1e6c831..c87503279e 100644
--- a/cpp/src/qpid/broker/MessageStoreModule.cpp
+++ b/cpp/src/qpid/broker/MessageStoreModule.cpp
@@ -75,12 +75,12 @@ void MessageStoreModule::destroy(PersistableMessage& msg)
     store->destroy(msg);
 }
 
-void MessageStoreModule::appendContent(PersistableMessage& msg, const std::string& data)
+void MessageStoreModule::appendContent(const PersistableMessage& msg, const std::string& data)
 {
     store->appendContent(msg, data);
 }
 
-void MessageStoreModule::loadContent(PersistableMessage& msg, string& data, uint64_t offset, uint32_t length)
+void MessageStoreModule::loadContent(const PersistableMessage& msg, string& data, uint64_t offset, uint32_t length)
 {
     store->loadContent(msg, data, offset, length);
 }
diff --git a/cpp/src/qpid/broker/MessageStoreModule.h b/cpp/src/qpid/broker/MessageStoreModule.h
index 46dbd35ec9..a983957b5e 100644
--- a/cpp/src/qpid/broker/MessageStoreModule.h
+++ b/cpp/src/qpid/broker/MessageStoreModule.h
@@ -56,8 +56,8 @@ public:
     void recover(RecoveryManager& queues);
     void stage(PersistableMessage& msg);
     void destroy(PersistableMessage& msg);
-    void appendContent(PersistableMessage& msg, const std::string& data);
-    void loadContent(PersistableMessage& msg, std::string& data, uint64_t offset, uint32_t length);
+    void appendContent(const PersistableMessage& msg, const std::string& data);
+    void loadContent(const PersistableMessage& msg, std::string& data, uint64_t offset, uint32_t length);
 
     void enqueue(TransactionContext* ctxt, PersistableMessage& msg, const PersistableQueue& queue);
     void dequeue(TransactionContext* ctxt, PersistableMessage& msg, const PersistableQueue& queue);
diff --git a/cpp/src/qpid/broker/NullMessageStore.cpp b/cpp/src/qpid/broker/NullMessageStore.cpp
index a86cb5f8c5..843d31654b 100644
--- a/cpp/src/qpid/broker/NullMessageStore.cpp
+++ b/cpp/src/qpid/broker/NullMessageStore.cpp
@@ -87,12 +87,12 @@ void NullMessageStore::destroy(PersistableMessage&)
     QPID_LOG(info, "No need to destroy staged message. Persistence not enabled.");
 }
 
-void NullMessageStore::appendContent(PersistableMessage&, const string&)
+void NullMessageStore::appendContent(const PersistableMessage&, const string&)
 {
     QPID_LOG(info, "Can't load content. Persistence not enabled.");
 }
 
-void NullMessageStore::loadContent(PersistableMessage&, string&, uint64_t, uint32_t)
+void NullMessageStore::loadContent(const PersistableMessage&, string&, uint64_t, uint32_t)
 {
     QPID_LOG(info, "Can't load content. Persistence not enabled.");
 }
diff --git a/cpp/src/qpid/broker/NullMessageStore.h b/cpp/src/qpid/broker/NullMessageStore.h
index 5698d8a16d..bb7b245717 100644
--- a/cpp/src/qpid/broker/NullMessageStore.h
+++ b/cpp/src/qpid/broker/NullMessageStore.h
@@ -57,8 +57,8 @@ public:
     virtual void recover(RecoveryManager& queues);
     virtual void stage(PersistableMessage& msg);
     virtual void destroy(PersistableMessage& msg);
-    virtual void appendContent(PersistableMessage& msg, const std::string& data);
-    virtual void loadContent(PersistableMessage& msg, std::string& data, uint64_t offset, uint32_t length);
+    virtual void appendContent(const PersistableMessage& msg, const std::string& data);
+    virtual void loadContent(const PersistableMessage& msg, std::string& data, uint64_t offset, uint32_t length);
     virtual void enqueue(TransactionContext* ctxt, PersistableMessage& msg, const PersistableQueue& queue);
     virtual void dequeue(TransactionContext* ctxt, PersistableMessage& msg, const PersistableQueue& queue);
     virtual u_int32_t outstandingQueueAIO(const PersistableQueue& queue);
diff --git a/cpp/src/tests/MessageBuilderTest.cpp b/cpp/src/tests/MessageBuilderTest.cpp
index 98f5bd92a8..8598f45d80 100644
--- a/cpp/src/tests/MessageBuilderTest.cpp
+++ b/cpp/src/tests/MessageBuilderTest.cpp
@@ -71,10 +71,10 @@ class MessageBuilderTest : public CppUnit::TestCase
             msg.setPersistenceId(++id);
         }
 
-        void appendContent(PersistableMessage& msg, const string& data)
+        void appendContent(const PersistableMessage& msg, const string& data)
         {
             checkExpectation(APPEND);
-            CPPUNIT_ASSERT_EQUAL(expectedMsg, &msg);
+            CPPUNIT_ASSERT_EQUAL((const PersistableMessage*) expectedMsg, &msg);
             CPPUNIT_ASSERT_EQUAL(expectedData, data);            
         }