1 files changed, 3 insertions, 9 deletions
diff --git a/cpp/broker/src/Message.cpp b/cpp/broker/src/Message.cpp
index a4ae85e904..a44eeaab59 100644
--- a/cpp/broker/src/Message.cpp
+++ b/cpp/broker/src/Message.cpp
@@ -33,7 +33,8 @@ Message::Message(const ConnectionToken* const _publisher,
                                                      routingKey(_routingKey), 
                                                      mandatory(_mandatory),
                                                      immediate(_immediate),
-                                                     redelivered(false){
+                                                     redelivered(false),
+                                                     size(0){
 
 }
 
@@ -46,6 +47,7 @@ void Message::setHeader(AMQHeaderBody::shared_ptr header){
 
 void Message::addContent(AMQContentBody::shared_ptr data){
     content.push_back(data);
+    size += data->size();    
 }
 
 bool Message::isComplete(){
@@ -78,14 +80,6 @@ BasicHeaderProperties* Message::getHeaderProperties(){
     return dynamic_cast<BasicHeaderProperties*>(header->getProperties());
 }
 
-u_int64_t Message::contentSize(){
-    u_int64_t size(0);
-    for(content_iterator i = content.begin(); i != content.end(); i++){
-        size += (*i)->size();
-    }
-    return size;
-}
-
 const ConnectionToken* const Message::getPublisher(){
     return publisher;
 }