From 243b1d7d451e835682320d3142e9693fc7a91add Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Tue, 13 Jan 2009 18:52:19 +0000 Subject: Start to fix Timer to improve encapsulation and then fix its inbuilt race conditions (mostly due to the awkward interface of Timer and TimerTask) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@734213 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/DtxManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpp/src/qpid/broker/DtxManager.cpp') diff --git a/cpp/src/qpid/broker/DtxManager.cpp b/cpp/src/qpid/broker/DtxManager.cpp index f4494fccc6..11e16ec837 100644 --- a/cpp/src/qpid/broker/DtxManager.cpp +++ b/cpp/src/qpid/broker/DtxManager.cpp @@ -126,7 +126,7 @@ void DtxManager::setTimeout(const std::string& xid, uint32_t secs) intrusive_ptr timeout = record->getTimeout(); if (timeout.get()) { if (timeout->timeout == secs) return;//no need to do anything further if timeout hasn't changed - timeout->cancelled = true; + timeout->cancel(); } timeout = intrusive_ptr(new DtxTimeout(secs, *this, xid)); record->setTimeout(timeout); -- cgit v1.2.1