* cpp/lib/broker/Content.h: removed destroy. Destructor cleans up.

* cpp/lib/broker/BrokerMessage.cpp: Removed Content::destroy call,
* cpp/lib/broker/InMemoryContent.cpp/.h: Remove empty destroy() and destructor.
* cpp/lib/broker/LazyLoadedContent.cpp/.h: Moved destroy() to destructor


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@504708 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 4 deletions

diff --git a/cpp/lib/broker/LazyLoadedContent.cpp b/cpp/lib/broker/LazyLoadedContent.cpp
index d8f18d5c8b..e4ea1333e7 100644
--- a/cpp/lib/broker/LazyLoadedContent.cpp
+++ b/cpp/lib/broker/LazyLoadedContent.cpp
@@ -25,6 +25,11 @@
 using namespace qpid::broker;
 using namespace qpid::framing;
 
+LazyLoadedContent::~LazyLoadedContent()
+{
+    store->destroy(msg);
+}
+
 LazyLoadedContent::LazyLoadedContent(MessageStore* const _store, Message* const _msg, u_int64_t _expectedSize) : 
     store(_store), msg(_msg), expectedSize(_expectedSize) {}
 
@@ -61,7 +66,3 @@ void LazyLoadedContent::encode(Buffer&)
     //do nothing as all content is written as soon as it is added 
 }
 
-void LazyLoadedContent::destroy()
-{
-    store->destroy(msg);
-}