diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2007-12-20 17:40:46 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2007-12-20 17:40:46 +0000 |
| commit | fa1bb97b6d845f29ddeac468fec21ab6a6b8f2ae (patch) | |
| tree | ea0df81c764060793c7879d1f9e0f10c0545f035 /qpid/cpp/src | |
| parent | a3f994526194bda58a1e160b3191eb944ec1f6dc (diff) | |
| download | qpid-python-fa1bb97b6d845f29ddeac468fec21ab6a6b8f2ae.tar.gz | |
Probable fix for QPID-712:
Poller::epollToDirection now treats EPOLLERR as equivalent to EPOLLHUP for
purposes of indicating a disconnect from the peer on the write side of the
connection
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@605982 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, 3 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp b/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp index 0e984d49ee..3f161ccbbe 100644 --- a/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp +++ b/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp @@ -165,7 +165,9 @@ class PollerPrivate { case ::EPOLLIN: return Poller::READABLE; case ::EPOLLOUT: return Poller::WRITABLE; case ::EPOLLIN | ::EPOLLOUT: return Poller::READ_WRITABLE; - default: return (events & ::EPOLLHUP) ? Poller::DISCONNECTED : Poller::INVALID; + default: + return (events & ::EPOLLHUP | ::EPOLLERR) ? + Poller::DISCONNECTED : Poller::INVALID; } } |