summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2012-05-28 21:24:39 +0000
committerAlan Conway <aconway@apache.org>2012-05-28 21:24:39 +0000
commit739f8964cdb5baf786759fb900928206a404d3fa (patch)
tree3e9445661dbbe76f9f27bf44493bdb9d71c5233e /qpid/cpp/src
parent2f28d0179033f3caeed58a69bc9ff11afe6e1b80 (diff)
downloadqpid-python-739f8964cdb5baf786759fb900928206a404d3fa.tar.gz
NO-JIRA: Add timerTask->cancel to ~AsynchIOHandler.
Observed crashes where timer fires after AsynchIOHandler is deleted. This should prevent such crashes. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1343397 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp b/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
index 3edc896724..8e83c9b32d 100644
--- a/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
+++ b/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
@@ -73,6 +73,8 @@ AsynchIOHandler::AsynchIOHandler(const std::string& id, ConnectionCodec::Factory
AsynchIOHandler::~AsynchIOHandler() {
if (codec)
codec->closed();
+ if (timeoutTimerTask)
+ timeoutTimerTask->cancel();
delete codec;
}