From 64bf302747861af7318c3f60aea37aeabb1a1900 Mon Sep 17 00:00:00 2001 From: Kenneth Anthony Giusti Date: Tue, 29 Nov 2011 13:34:09 +0000 Subject: QPID-3648: fix cleanup of remote agent on broker shutdown. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1207877 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/management/ManagementAgent.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'qpid/cpp') diff --git a/qpid/cpp/src/qpid/management/ManagementAgent.cpp b/qpid/cpp/src/qpid/management/ManagementAgent.cpp index 5799a1adca..b2a039d1fa 100644 --- a/qpid/cpp/src/qpid/management/ManagementAgent.cpp +++ b/qpid/cpp/src/qpid/management/ManagementAgent.cpp @@ -111,6 +111,8 @@ ManagementAgent::RemoteAgent::~RemoteAgent () if (mgmtObject != 0) { mgmtObject->resourceDestroy(); agent.deleteObjectNowLH(mgmtObject->getObjectId()); + delete mgmtObject; + mgmtObject = 0; } } @@ -146,6 +148,8 @@ ManagementAgent::~ManagementAgent () v2Topic.reset(); v2Direct.reset(); + remoteAgents.clear(); + moveNewObjectsLH(); for (ManagementObjectMap::iterator iter = managementObjects.begin (); iter != managementObjects.end (); -- cgit v1.2.1