diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2009-08-11 05:35:05 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2009-08-11 05:35:05 +0000 |
| commit | d5bd5d9cda9a6b4c53377b158e6d85d46d57e919 (patch) | |
| tree | 740111a883fe518915fb9c610bf2ddc96877c668 | |
| parent | 02fe01cef62e75e71053e30815cfd45976804ce1 (diff) | |
| download | qpid-python-d5bd5d9cda9a6b4c53377b158e6d85d46d57e919.tar.gz | |
Ensure that a PollerHandle that has had a disconnected event can never
be returned with any more events
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@802991 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp b/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp index 09f3f8edc7..9fd0602ce9 100644 --- a/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp +++ b/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp @@ -575,8 +575,11 @@ Poller::Event Poller::wait(Duration timeout) { // (just not writable), allow us to readable until we get here again if (epe.events & ::EPOLLHUP) { if (eh.isHungup()) { + eh.setInactive(); // Don't set up last Handle so that we don't reset this handle - // when we get back in here + // on re-entering Poller::wait. This means that we will never + // be set active again once we've returned disconnected, and so + // can never be returned again. return Event(handle, DISCONNECTED); } eh.setHungup(); |