summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2010-01-21 06:19:41 +0000
committerAndrew Stitcher <astitcher@apache.org>2010-01-21 06:19:41 +0000
commit531cf12f02c8eeac324cfa6876b8f508057fb6ee (patch)
treef3561af44f63f4782b83561f8e68e07e94ebf6d8 /qpid/cpp
parent257d5100e47330e55f851c4f73bad94553ebd797 (diff)
downloadqpid-python-531cf12f02c8eeac324cfa6876b8f508057fb6ee.tar.gz
Allow Connection to be closed whilst still connecting without error.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@901554 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/src/qpid/client/TCPConnector.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/client/TCPConnector.cpp b/qpid/cpp/src/qpid/client/TCPConnector.cpp
index 2de139d5df..360d8c133c 100644
--- a/qpid/cpp/src/qpid/client/TCPConnector.cpp
+++ b/qpid/cpp/src/qpid/client/TCPConnector.cpp
@@ -133,7 +133,8 @@ bool TCPConnector::closeInternal() {
bool ret = !closed;
if (!closed) {
closed = true;
- aio->queueForDeletion();
+ if (aio)
+ aio->queueForDeletion();
socket.close();
}
return ret;