From 3440b9189772b355b72b24ced083b0dac71cacb7 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Wed, 26 Jun 2013 17:52:25 +0000 Subject: QPID-4950: ensure exchange stats are updated with correct content size for messages git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1497024 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/broker/Deliverable.h | 1 - qpid/cpp/src/qpid/broker/Exchange.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'qpid/cpp') diff --git a/qpid/cpp/src/qpid/broker/Deliverable.h b/qpid/cpp/src/qpid/broker/Deliverable.h index e08d0e1b20..4dc67fdcfc 100644 --- a/qpid/cpp/src/qpid/broker/Deliverable.h +++ b/qpid/cpp/src/qpid/broker/Deliverable.h @@ -38,7 +38,6 @@ namespace qpid { virtual Message& getMessage() = 0; virtual void deliverTo(const boost::shared_ptr& queue) = 0; - virtual uint64_t contentSize() { return 0; } virtual ~Deliverable(){} }; } diff --git a/qpid/cpp/src/qpid/broker/Exchange.cpp b/qpid/cpp/src/qpid/broker/Exchange.cpp index f8a69c4451..b9080cdda5 100644 --- a/qpid/cpp/src/qpid/broker/Exchange.cpp +++ b/qpid/cpp/src/qpid/broker/Exchange.cpp @@ -135,7 +135,7 @@ void Exchange::doRoute(Deliverable& msg, ConstBindingList b) if (mgmtExchange != 0) { qmf::org::apache::qpid::broker::Exchange::PerThreadStats *eStats = mgmtExchange->getStatistics(); - uint64_t contentSize = msg.contentSize(); + uint64_t contentSize = msg.getMessage().getContentSize(); eStats->msgReceives += 1; eStats->byteReceives += contentSize; -- cgit v1.2.1