From 1b5c2b0eb497cd8e44e5b907fcbe7daff1452a51 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 6 Feb 2009 16:39:17 +0000 Subject: Fix seg fault if cluster and management are enabled. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@741624 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/cluster/Cluster.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'cpp/src') diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp index 4709ca759d..8e6ece11cc 100644 --- a/cpp/src/qpid/cluster/Cluster.cpp +++ b/cpp/src/qpid/cluster/Cluster.cpp @@ -109,6 +109,14 @@ Cluster::Cluster(const std::string& name_, const Url& url_, broker::Broker& b, b lastBroker(false), sequence(0) { + mAgent = ManagementAgent::Singleton::getInstance(); + if (mAgent != 0){ + _qmf::Package packageInit(mAgent); + mgmtObject = new _qmf::Cluster (mAgent, this, &broker,name,myUrl.str()); + mAgent->addObject (mgmtObject); + mgmtObject->set_status("JOINING"); + } + failoverExchange.reset(new FailoverExchange(this)); if (quorum_) quorum.init(); cpg.join(name); @@ -125,13 +133,6 @@ void Cluster::initialize() { if (myUrl.empty()) myUrl = Url::getIpAddressesUrl(broker.getPort(broker::Broker::TCP_TRANSPORT)); QPID_LOG(notice, *this << " joining cluster " << name << " with url=" << myUrl); - mAgent = ManagementAgent::Singleton::getInstance(); - if (mAgent != 0){ - _qmf::Package packageInit(mAgent); - mgmtObject = new _qmf::Cluster (mAgent, this, &broker,name,myUrl.str()); - mAgent->addObject (mgmtObject); - mgmtObject->set_status("JOINING"); - } broker.getKnownBrokers = boost::bind(&Cluster::getUrls, this); dispatcher.start(); deliverEventQueue.start(); -- cgit v1.2.1