From 9aebc2ee443637a579bb8c5eb6ba73227df71f88 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Tue, 31 Jul 2007 09:09:19 +0000 Subject: * 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@561279 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp b/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp index 37a8510fe6..57acafd928 100644 --- a/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp +++ b/qpid/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; -- cgit v1.2.1