diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2009-01-13 18:52:19 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2009-01-13 18:52:19 +0000 |
| commit | 243b1d7d451e835682320d3142e9693fc7a91add (patch) | |
| tree | cb504c91c9d31a270feef6f68d82441ee4e2eeaa /cpp/src/qpid/broker/DtxManager.cpp | |
| parent | 73ba540688ac9d9145adee70b5489a91f2adf955 (diff) | |
| download | qpid-python-243b1d7d451e835682320d3142e9693fc7a91add.tar.gz | |
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
Diffstat (limited to 'cpp/src/qpid/broker/DtxManager.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/DtxManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<DtxTimeout> 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<DtxTimeout>(new DtxTimeout(secs, *this, xid)); record->setTimeout(timeout); |