From 47cbb850a3c4816042f825059127759820d2a8f4 Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Thu, 20 Nov 2008 19:12:21 +0000 Subject: Add proper cleanup of stored management objects during agent shutdown. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@719326 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/agent/ManagementAgentImpl.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'cpp/src/qpid') diff --git a/cpp/src/qpid/agent/ManagementAgentImpl.cpp b/cpp/src/qpid/agent/ManagementAgentImpl.cpp index 173785a671..dc9122664d 100644 --- a/cpp/src/qpid/agent/ManagementAgentImpl.cpp +++ b/cpp/src/qpid/agent/ManagementAgentImpl.cpp @@ -100,6 +100,20 @@ ManagementAgentImpl::~ManagementAgentImpl() if (!connThreadBody.isSleeping()) { connThread.join(); } + + // Release the memory associated with stored management objects. + { + Mutex::ScopedLock lock(agentLock); + + moveNewObjectsLH(); + for (ManagementObjectMap::iterator iter = managementObjects.begin (); + iter != managementObjects.end (); + iter++) { + ManagementObject* object = iter->second; + delete object; + } + managementObjects.clear(); + } } void ManagementAgentImpl::init(const string& brokerHost, -- cgit v1.2.1