Author: aconway
Date: Mon Sep 24 19:55:22 2012
New Revision: 1389542
URL: http://svn.apache.org/viewvc?rev=1389542&view=rev
Log:
NO-JIRA: Add missing initializers on ha::BrokerInfo contstructor.
Modified:
qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.h
qpid/trunk/qpid/cpp/src/tests/ha_tests.py
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.cpp?rev=1389542&r1=1389541&r2=1389542&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.cpp Mon Sep 24 19:55:22 2012
@@ -43,6 +43,8 @@ using types::Uuid;
using types::Variant;
using framing::FieldTable;
+BrokerInfo::BrokerInfo() : port(0), status(JOINING) {}
+
BrokerInfo::BrokerInfo(const std::string& host, uint16_t port_, const
types::Uuid& id) :
hostName(host), port(port_), systemId(id), status(JOINING)
{
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.h?rev=1389542&r1=1389541&r2=1389542&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.h Mon Sep 24 19:55:22 2012
@@ -43,7 +43,7 @@ class BrokerInfo
typedef std::set<BrokerInfo> Set;
typedef std::map<types::Uuid, BrokerInfo> Map;
- BrokerInfo() {}
+ BrokerInfo();
BrokerInfo(const std::string& host, uint16_t port_, const types::Uuid& id);
BrokerInfo(const framing::FieldTable& ft) { assign(ft); }
BrokerInfo(const types::Variant::Map& m) { assign(m); }
Modified: qpid/trunk/qpid/cpp/src/tests/ha_tests.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ha_tests.py?rev=1389542&r1=1389541&r2=1389542&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ha_tests.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/ha_tests.py Mon Sep 24 19:55:22 2012
@@ -109,6 +109,7 @@ class HaBroker(Broker):
def wait_status(self, status):
def try_get_status():
+ self._status = self.ha_status()
# Ignore ConnectionError, the broker may not be up yet.
try:
self._status = self.ha_status()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
