diff options
| author | Alan Conway <aconway@apache.org> | 2010-09-09 13:43:25 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-09-09 13:43:25 +0000 |
| commit | cc92e121b9278a0593fec9091b097e4f32d64d6c (patch) | |
| tree | a130485fa3e39df0d5e3f68b17c680426689cb0a /cpp/src/qpid/cluster/Cluster.cpp | |
| parent | b0782bea575433c9620edd305f888f72a303f674 (diff) | |
| download | qpid-python-cc92e121b9278a0593fec9091b097e4f32d64d6c.tar.gz | |
Break deadlock caused when ClusterTimer::drop is called concurrently with Timer::add.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@995426 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/Cluster.cpp')
| -rw-r--r-- | cpp/src/qpid/cluster/Cluster.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp index df0e612af7..5da1579cb7 100644 --- a/cpp/src/qpid/cluster/Cluster.cpp +++ b/cpp/src/qpid/cluster/Cluster.cpp @@ -1126,7 +1126,6 @@ void Cluster::timerDrop(const MemberId& , const std::string& name, Lock&) { } bool Cluster::isElder() const { - Monitor::ScopedLock l(lock); return elder; } |