Return-Path: Delivered-To: apmail-incubator-qpid-commits-archive@locus.apache.org Received: (qmail 49709 invoked from network); 2 Oct 2007 12:35:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Oct 2007 12:35:22 -0000 Received: (qmail 94909 invoked by uid 500); 2 Oct 2007 12:35:12 -0000 Delivered-To: apmail-incubator-qpid-commits-archive@incubator.apache.org Received: (qmail 94895 invoked by uid 500); 2 Oct 2007 12:35:12 -0000 Mailing-List: contact qpid-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: qpid-dev@incubator.apache.org Delivered-To: mailing list qpid-commits@incubator.apache.org Received: (qmail 94886 invoked by uid 99); 2 Oct 2007 12:35:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Oct 2007 05:35:12 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Oct 2007 12:35:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BDDD31A9832; Tue, 2 Oct 2007 05:35:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r581209 - in /incubator/qpid/trunk/qpid/cpp/src: qpid/broker/ tests/ Date: Tue, 02 Oct 2007 12:35:00 -0000 To: qpid-commits@incubator.apache.org From: gsim@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071002123501.BDDD31A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gsim Date: Tue Oct 2 05:34:59 2007 New Revision: 581209 URL: http://svn.apache.org/viewvc?rev=581209&view=rev Log: mark Message::sendContent() as const Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h incubator/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp?rev=581209&r1=581208&r2=581209&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp Tue Oct 2 05:34:59 2007 @@ -139,7 +139,7 @@ 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 Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h?rev=581209&r1=581208&r2=581209&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h (original) +++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h Tue Oct 2 05:34:59 2007 @@ -114,7 +114,7 @@ */ 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; Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h?rev=581209&r1=581208&r2=581209&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h (original) +++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h Tue Oct 2 05:34:59 2007 @@ -89,7 +89,7 @@ /** * 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 @@ * 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 Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp?rev=581209&r1=581208&r2=581209&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp Tue Oct 2 05:34:59 2007 @@ -75,12 +75,12 @@ 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); } Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h?rev=581209&r1=581208&r2=581209&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h (original) +++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h Tue Oct 2 05:34:59 2007 @@ -56,8 +56,8 @@ 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); Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp?rev=581209&r1=581208&r2=581209&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp Tue Oct 2 05:34:59 2007 @@ -87,12 +87,12 @@ 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."); } Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h?rev=581209&r1=581208&r2=581209&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h (original) +++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h Tue Oct 2 05:34:59 2007 @@ -57,8 +57,8 @@ 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); Modified: incubator/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp?rev=581209&r1=581208&r2=581209&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp Tue Oct 2 05:34:59 2007 @@ -71,10 +71,10 @@ 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); }