1 files changed, 10 insertions, 1 deletions
diff --git a/cpp/src/qpid/console/Broker.cpp b/cpp/src/qpid/console/Broker.cpp
index 2e7ba95b1d..c6b1be1d31 100644
--- a/cpp/src/qpid/console/Broker.cpp
+++ b/cpp/src/qpid/console/Broker.cpp
@@ -59,6 +59,13 @@ Broker::~Broker()
 {
 }
 
+string Broker::getUrl() const
+{
+    stringstream url;
+    url << connectionSettings.host << ":" << connectionSettings.port;
+    return url.str();
+}
+
 void Broker::encodeHeader(framing::Buffer& buf, uint8_t opcode, uint32_t seq) const
 {
     buf.putOctet('A');
@@ -249,7 +256,9 @@ void Broker::waitForStable()
         return;
     syncInFlight = true;
     while (reqsOutstanding != 0) {
-        cond.wait(lock);  // TODO: put timeout delay in here!
+        bool result = cond.wait(lock, AbsTime(now(), TIME_SEC * sessionManager.settings.getTimeout));
+        if (!result)
+            throw(Exception("Timed out waiting for broker to synchronize"));
     }
 }