summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2007-07-31 09:09:19 +0000
committerAndrew Stitcher <astitcher@apache.org>2007-07-31 09:09:19 +0000
commitf952f94b504de0a14abd52944adf5d74f853be68 (patch)
tree34e8626d7911fbad2dd606285e6baa31b7574d4a /cpp/src
parentd964aa1f2911d058e0c7346906668815a31fa9a7 (diff)
downloadqpid-python-f952f94b504de0a14abd52944adf5d74f853be68.tar.gz
* Fix crash on shutdown due to underlying poller being shutdown twice
- Actually just made the poller ignore subsequent shutdown attempts git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@561279 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/sys/epoll/EpollPoller.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/src/qpid/sys/epoll/EpollPoller.cpp b/cpp/src/qpid/sys/epoll/EpollPoller.cpp
index 37a8510fe6..57acafd928 100644
--- a/cpp/src/qpid/sys/epoll/EpollPoller.cpp
+++ b/cpp/src/qpid/sys/epoll/EpollPoller.cpp
@@ -239,6 +239,10 @@ void Poller::rearmFd(PollerHandle& handle) {
}
void Poller::shutdown() {
+ // Allow sloppy code to shut us down more than once
+ if (impl->isShutdown)
+ return;
+
// Don't use any locking here - isshutdown will be visible to all
// after the epoll_ctl() anyway (it's a memory barrier)
impl->isShutdown = true;