summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2002-05-02 21:52:09 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2002-05-02 21:52:09 +0000
commitf67c59cf7f50288c6d2bb069cbf2975391f904d6 (patch)
treeca98708a777ba0e54b0db9f889317a56aeb20ec8
parentc88db79f5252fa56f0dd4e8d6cc8c033a0d52b07 (diff)
downloadATCD-f67c59cf7f50288c6d2bb069cbf2975391f904d6.tar.gz
ChangeLogTag:Thu May 2 14:02:20 2002 Ossama Othman <ossama@uci.edu>
-rw-r--r--ace/Dev_Poll_Reactor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ace/Dev_Poll_Reactor.cpp b/ace/Dev_Poll_Reactor.cpp
index 09d51f9ae7b..dc4b469ce20 100644
--- a/ace/Dev_Poll_Reactor.cpp
+++ b/ace/Dev_Poll_Reactor.cpp
@@ -1162,8 +1162,8 @@ ACE_Dev_Poll_Reactor::work_pending_i (ACE_Time_Value * max_wait_time)
|| (this_timeout != 0 && max_wait_time != 0
&& *this_timeout != *max_wait_time) ? 1 : 0);
- // If timers are pending, override any error condition from the
- // poll.
+ // If timers are pending, override any error condition or timeout
+ // from the poll.
return (nfds <= 0 && timers_pending != 0 ? 1 : nfds);
}