diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2010-09-24 15:24:38 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2010-09-24 15:24:38 +0000 |
| commit | 14fbad6750e48929229fd671b6ae075f11ccd9d9 (patch) | |
| tree | 74023712cc0eaa507f758960c2deef913f082b6e | |
| parent | e0c0f4831a07413bed73c936eb6711e937ecbab2 (diff) | |
| download | qpid-python-14fbad6750e48929229fd671b6ae075f11ccd9d9.tar.gz | |
QPID-2885: clean up memory leaks on C++ qmf console shutdown.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1000907 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/src/qpid/console/Broker.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/qpid/console/SessionManager.cpp | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/cpp/src/qpid/console/Broker.cpp b/cpp/src/qpid/console/Broker.cpp index d2ff8f819e..86a17d4a10 100644 --- a/cpp/src/qpid/console/Broker.cpp +++ b/cpp/src/qpid/console/Broker.cpp @@ -59,6 +59,11 @@ Broker::~Broker() { connThreadBody.shutdown(); connThread.join(); + resetAgents(); + // resetAgents() does not delete the broker agent... + for (AgentMap::iterator iter = agents.begin(); iter != agents.end(); iter++) { + delete iter->second; + } } string Broker::getUrl() const diff --git a/cpp/src/qpid/console/SessionManager.cpp b/cpp/src/qpid/console/SessionManager.cpp index 4f39095a54..80c5959417 100644 --- a/cpp/src/qpid/console/SessionManager.cpp +++ b/cpp/src/qpid/console/SessionManager.cpp @@ -46,6 +46,15 @@ SessionManager::~SessionManager() for (vector<Broker*>::iterator iter = brokers.begin(); iter != brokers.end(); iter++) delete *iter; + + for (map<string, Package*>::iterator iter = packages.begin(); + iter != packages.end(); iter++) { + for (Package::ClassMap::iterator citer = iter->second->classes.begin(); + citer != iter->second->classes.end(); + citer++) + delete citer->second; + delete iter->second; + } } Broker* SessionManager::addBroker(client::ConnectionSettings& settings) |