summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2009-06-23 20:02:13 +0000
committerAndrew Stitcher <astitcher@apache.org>2009-06-23 20:02:13 +0000
commit582c5382fc75fd4decf16a07f70c3df3556b1b1f (patch)
tree10648e1ba89221a3d1fa1da284e5d4ed5a039331 /qpid/cpp/src
parent30aec73077ff041e61a9c1a1cdd9f88a4cc08c48 (diff)
downloadqpid-python-582c5382fc75fd4decf16a07f70c3df3556b1b1f.tar.gz
Make sure you close down heartbeatTimer for every close even if you don't
need to do anything else git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@787809 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-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 f6c7176664..f1379296fd 100644
--- a/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
+++ b/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
@@ -176,10 +176,11 @@ void ConnectionImpl::idleOut()
void ConnectionImpl::close()
{
- if (!handler.isOpen()) return;
if (heartbeatTask) {
heartbeatTask->cancel();
}
+
+ if (!handler.isOpen()) return;
handler.close();
closed(CLOSE_CODE_NORMAL, "Closed by client");
}