summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorTed Ross <tross@apache.org>2008-06-04 16:52:26 +0000
committerTed Ross <tross@apache.org>2008-06-04 16:52:26 +0000
commit6e1650a9d8f74166ee499c64daa57e8180e65e27 (patch)
treed00ce87bc415dbfc27a7cbe6bf778f451851e449 /qpid/cpp/src
parent563e02f00fd35634cde9db8eaa6c9f29c1456afb (diff)
downloadqpid-python-6e1650a9d8f74166ee499c64daa57e8180e65e27.tar.gz
QPID-1121
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@663304 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/broker/Link.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/Link.cpp b/qpid/cpp/src/qpid/broker/Link.cpp
index 08b9d8fe3e..630ce68150 100644
--- a/qpid/cpp/src/qpid/broker/Link.cpp
+++ b/qpid/cpp/src/qpid/broker/Link.cpp
@@ -102,9 +102,11 @@ void Link::setStateLH (int newState)
void Link::startConnectionLH ()
{
try {
+ // Set the state before calling connect. It is possible that connect
+ // will fail synchronously and call Link::closed before returning.
+ setStateLH(STATE_CONNECTING);
broker->connect (host, port, useSsl,
boost::bind (&Link::closed, this, _1, _2));
- setStateLH(STATE_CONNECTING);
} catch(std::exception& e) {
setStateLH(STATE_WAITING);
mgmtObject->set_lastError (e.what());