NO-JIRA: Add missing initializers on ha::BrokerInfo contstructor.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1389542 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 4 insertions, 1 deletions

diff --git a/cpp/src/qpid/ha/BrokerInfo.cpp b/cpp/src/qpid/ha/BrokerInfo.cpp
index cecb9b0bfe..73e86d94fe 100644
--- a/cpp/src/qpid/ha/BrokerInfo.cpp
+++ b/cpp/src/qpid/ha/BrokerInfo.cpp
@@ -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)
 {
diff --git a/cpp/src/qpid/ha/BrokerInfo.h b/cpp/src/qpid/ha/BrokerInfo.h
index 642f7c1361..5131e23be2 100644
--- a/cpp/src/qpid/ha/BrokerInfo.h
+++ b/cpp/src/qpid/ha/BrokerInfo.h
@@ -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); }
diff --git a/cpp/src/tests/ha_tests.py b/cpp/src/tests/ha_tests.py
index 64d87fbc86..31142de293 100755
--- a/cpp/src/tests/ha_tests.py
+++ b/cpp/src/tests/ha_tests.py
@@ -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()