diff options
author | Alan Conway <aconway@apache.org> | 2008-11-19 15:36:16 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2008-11-19 15:36:16 +0000 |
commit | e1cc77fda58a22b4d74e19688c0247ce1735ee39 (patch) | |
tree | e51e43dc2d1b7d2ea88a1c0fd8eea0baee7576f6 /cpp/src/qpid/cluster/Cluster.cpp | |
parent | 27de47471df6ceb5dadd1d24cc00166056c9dbe4 (diff) | |
download | qpid-python-e1cc77fda58a22b4d74e19688c0247ce1735ee39.tar.gz |
Fix seg fault caused by exceptiosn thrown in Cluster ctor.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@718983 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/Cluster.cpp')
-rw-r--r-- | cpp/src/qpid/cluster/Cluster.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp index 5dffae2b2f..d08e06c863 100644 --- a/cpp/src/qpid/cluster/Cluster.cpp +++ b/cpp/src/qpid/cluster/Cluster.cpp @@ -113,12 +113,12 @@ Cluster::Cluster(const std::string& name_, const Url& url_, broker::Broker& b, b } broker.getKnownBrokers = boost::bind(&Cluster::getUrls, this); failoverExchange.reset(new FailoverExchange(this)); - broker.addFinalizer(boost::bind(&Cluster::brokerShutdown, this)); cpgDispatchHandle.startWatch(poller); deliverQueue.start(); QPID_LOG(notice, *this << " joining cluster " << name.str()); if (useQuorum) quorum.init(); cpg.join(name); + broker.addFinalizer(boost::bind(&Cluster::brokerShutdown, this)); // Must be last for exception safety. } Cluster::~Cluster() { |