diff options
| author | Alan Conway <aconway@apache.org> | 2007-03-29 22:30:48 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-03-29 22:30:48 +0000 |
| commit | 1a23d52070195a9c8de98dd4af6e19f42051f1a5 (patch) | |
| tree | a7515a61e0a46defc4ef84bea52424c38bdbba0c /cpp/lib/broker/TopicExchange.cpp | |
| parent | 45d083f70618d21ae9d138cf0c3d8e44c84f4f93 (diff) | |
| download | qpid-python-1a23d52070195a9c8de98dd4af6e19f42051f1a5.tar.gz | |
Fixed memory leak: removed Binding and ExchangeBinding.
These classes unbind a deleted queue from any Exchanges.
But Exchanges hold shared_ptr<Queue>, so queues never deleted while
the exchange exists. Moreover queue-binding form a shared_ptr cycle
causing a leak.
Raised QPID-438 for the remaining problem: destroyed queues are never
unbound or deleted
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@523857 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/lib/broker/TopicExchange.cpp')
| -rw-r--r-- | cpp/lib/broker/TopicExchange.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cpp/lib/broker/TopicExchange.cpp b/cpp/lib/broker/TopicExchange.cpp index 3ebb3c8c56..796d3cea02 100644 --- a/cpp/lib/broker/TopicExchange.cpp +++ b/cpp/lib/broker/TopicExchange.cpp @@ -19,7 +19,6 @@ * */ #include <TopicExchange.h> -#include <ExchangeBinding.h> #include <algorithm> using namespace qpid::broker; @@ -118,11 +117,10 @@ bool TopicPattern::match(const Tokens& target) const TopicExchange::TopicExchange(const string& _name) : Exchange(_name) { } -void TopicExchange::bind(Queue::shared_ptr queue, const string& routingKey, const FieldTable* args){ +void TopicExchange::bind(Queue::shared_ptr queue, const string& routingKey, const FieldTable* /*args*/){ Monitor::ScopedLock l(lock); TopicPattern routingPattern(routingKey); bindings[routingPattern].push_back(queue); - queue->bound(new ExchangeBinding(this, queue, routingKey, args)); } void TopicExchange::unbind(Queue::shared_ptr queue, const string& routingKey, const FieldTable* /*args*/){ |