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@718966 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 0 deletions

diff --git a/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp b/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp
index d4627ec721..9387453cca 100644
--- a/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp
+++ b/qpid/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);
 }