QPID-4555: HA Check for backup ready when new backup joins.

This test was missing so if there were no backed-up queues the backup would
never be marked ready. It was workig because of a separte bug:
auto-delete/exclusive queues were being replicated incorrectly so there were
always replicated queues (temp queues created by qpid-ha)

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

1 files changed, 6 insertions, 3 deletions

diff --git a/qpid/cpp/src/qpid/ha/Primary.cpp b/qpid/cpp/src/qpid/ha/Primary.cpp
index 12535399e3..67108fa5f9 100644
--- a/qpid/cpp/src/qpid/ha/Primary.cpp
+++ b/qpid/cpp/src/qpid/ha/Primary.cpp
@@ -245,14 +245,17 @@ void Primary::opened(broker::Connection& connection) {
                 backup->setCatchupQueues(haBroker.getBroker().getQueues(), false);
             }
             backups[info.getSystemId()] = backup;
+            i = backups.find(info.getSystemId());
         }
         else {
             QPID_LOG(info, logPrefix << "Known backup connected: " << info);
             i->second->setConnection(&connection);
-            checkReady(i, l);
         }
-        if (info.getStatus() == JOINING) info.setStatus(CATCHUP);
-        membership.add(info);
+        if (info.getStatus() == JOINING) {
+            info.setStatus(CATCHUP);
+            membership.add(info);
+        }
+        if (i != backups.end()) checkReady(i, l);
     }
     else
         QPID_LOG(debug, logPrefix << "Accepted client connection "