diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2008-11-19 14:13:57 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2008-11-19 14:13:57 +0000 |
| commit | 27de47471df6ceb5dadd1d24cc00166056c9dbe4 (patch) | |
| tree | a79b717b9db6f4158eceb186ebcc199a66a1d9a1 /cpp/src | |
| parent | 18dee70d90657834e1afc2af1e541597ea18abf6 (diff) | |
| download | qpid-python-27de47471df6ceb5dadd1d24cc00166056c9dbe4.tar.gz | |
QPID-1474: Changed lock scope for PollerHandle::~PollerHandle
Also check state better to make sure the impl can't be deleted
more than once in a race
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@718966 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/sys/epoll/EpollPoller.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cpp/src/qpid/sys/epoll/EpollPoller.cpp b/cpp/src/qpid/sys/epoll/EpollPoller.cpp index d4627ec721..9387453cca 100644 --- a/cpp/src/qpid/sys/epoll/EpollPoller.cpp +++ b/cpp/src/qpid/sys/epoll/EpollPoller.cpp @@ -116,10 +116,15 @@ PollerHandle::PollerHandle(const IOHandle& h) : {} PollerHandle::~PollerHandle() { + { ScopedLock<Mutex> l(impl->lock); + if (impl->isDeleted()) { + return; + } if (impl->isActive()) { impl->setDeleted(); } + } PollerHandleDeletionManager.markForDeletion(impl); } |