summaryrefslogtreecommitdiff
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
commit330fb23948e684856fd4f24337967f67d94befc2 (patch)
treebdc0dee5be8f83cf425a6ef2bffe5691c96cb23e
parent2c83aa9fdf0fb938c9eb44c2e55da54208092bec (diff)
downloadqpid-python-330fb23948e684856fd4f24337967f67d94befc2.tar.gz
Make sure the heartbeat interval is started for the waitForOpen
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@782494 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/client/ConnectionImpl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/client/ConnectionImpl.cpp b/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
index 6639f92324..f6c7176664 100644
--- a/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
+++ b/qpid/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()) {