1 files changed, 10 insertions, 2 deletions
diff --git a/cpp/src/qpid/client/FailoverListener.cpp b/cpp/src/qpid/client/FailoverListener.cpp
index 3396f5598c..bf4fa91d49 100644
--- a/cpp/src/qpid/client/FailoverListener.cpp
+++ b/cpp/src/qpid/client/FailoverListener.cpp
@@ -33,8 +33,16 @@ FailoverListener::FailoverListener(Connection c) :
     connection(c),
     session(c.newSession(AMQ_FAILOVER+"."+framing::Uuid(true).str())),
     subscriptions(session)
-{
-    knownBrokers = c.getInitialBrokers();
+{ init(true); }
+
+FailoverListener::FailoverListener(Connection c, bool useInitial) :
+    connection(c),
+    session(c.newSession(AMQ_FAILOVER+"."+framing::Uuid(true).str())),
+    subscriptions(session)
+{ init(useInitial); }
+
+void FailoverListener::init(bool useInitial) {
+    if (useInitial) knownBrokers = connection.getInitialBrokers();
     if (session.exchangeQuery(arg::name=AMQ_FAILOVER).getNotFound()) {
         session.close();
         return;