diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2007-07-31 09:09:19 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2007-07-31 09:09:19 +0000 |
| commit | 9aebc2ee443637a579bb8c5eb6ba73227df71f88 (patch) | |
| tree | 6ffb91ef6e51bce44f5c760ab2ac565cf37709e6 /qpid/cpp/src | |
| parent | 8f953191038458d197e1a280d6119ebcdf90b34e (diff) | |
| download | qpid-python-9aebc2ee443637a579bb8c5eb6ba73227df71f88.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@561279 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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; |