summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorCarl C. Trieloff <cctrieloff@apache.org>2009-06-08 01:35:26 +0000
committerCarl C. Trieloff <cctrieloff@apache.org>2009-06-08 01:35:26 +0000
commit832a2908c52cf00488361993085867de34dd6335 (patch)
tree6f53a40a0c1ac34386d8fcce918e4cb3b03436c3 /cpp/src
parent54c330ceaf69640d7055494903f7e601ab7171b9 (diff)
downloadqpid-python-832a2908c52cf00488361993085867de34dd6335.tar.gz
Make sure the heartbeat interval is started for the waitForOpen
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@782494 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/client/ConnectionImpl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/cpp/src/qpid/client/ConnectionImpl.cpp
index 6639f92324..f6c7176664 100644
--- a/cpp/src/qpid/client/ConnectionImpl.cpp
+++ b/cpp/src/qpid/client/ConnectionImpl.cpp
@@ -139,7 +139,6 @@ void ConnectionImpl::open()
connector->setShutdownHandler(this);
connector->connect(host, port);
connector->init();
- handler.waitForOpen();
// Enable heartbeat if requested
uint16_t heartbeat = static_cast<ConnectionSettings&>(handler).heartbeat;
@@ -150,6 +149,8 @@ void ConnectionImpl::open()
theTimer().add(heartbeatTask);
}
+ handler.waitForOpen();
+
//enable security layer if one has been negotiated:
std::auto_ptr<SecurityLayer> securityLayer = handler.getSecurityLayer();
if (securityLayer.get()) {