Return-Path: Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: (qmail 58004 invoked from network); 6 Feb 2009 16:39:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Feb 2009 16:39:48 -0000 Received: (qmail 41187 invoked by uid 500); 6 Feb 2009 16:39:41 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 41178 invoked by uid 500); 6 Feb 2009 16:39:41 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 41161 invoked by uid 99); 6 Feb 2009 16:39:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Feb 2009 08:39:41 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Feb 2009 16:39:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 22B2D23889B7; Fri, 6 Feb 2009 16:39:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r741624 - /qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp Date: Fri, 06 Feb 2009 16:39:17 -0000 To: commits@qpid.apache.org From: aconway@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090206163918.22B2D23889B7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aconway Date: Fri Feb 6 16:39:17 2009 New Revision: 741624 URL: http://svn.apache.org/viewvc?rev=741624&view=rev Log: Fix seg fault if cluster and management are enabled. Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp?rev=741624&r1=741623&r2=741624&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp (original) +++ qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp Fri Feb 6 16:39:17 2009 @@ -109,6 +109,14 @@ 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 @@ 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(); --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscribe@qpid.apache.org