summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-03-25 01:54:48 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-03-25 01:54:48 +0000
commit5f64e055584d78be7f7dac8f73fd0ce0f93a560a (patch)
tree8013eff5b319ca4986e22bc4aabc9b294d3430dc
parentd301b34c4d7257143f2bf9f38e930cf76283f2ce (diff)
downloadATCD-5f64e055584d78be7f7dac8f73fd0ce0f93a560a.tar.gz
*** empty log message ***
-rw-r--r--ChangeLog-98a6
-rw-r--r--ace/Proactor.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog-98a b/ChangeLog-98a
index 77011a121ac..516b6f73c25 100644
--- a/ChangeLog-98a
+++ b/ChangeLog-98a
@@ -1,3 +1,9 @@
+Tue Mar 24 19:48:44 1998 Irfan Pyarali <irfan@cs.wustl.edu>
+
+ * ace/Proactor.cpp (timeout): Changed comparison from || to
+ &&. Thanks to Jason Katz <Jason@email.rts-inc.com> for reporting
+ this.
+
Tue Mar 24 18:14:18 1998 Steve Huston <shuston@riverace.com>
* ace/Env_Value_T.h: added #include "ace/OS.h" to get the definition
diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp
index 237260ba434..ab51c6110f3 100644
--- a/ace/Proactor.cpp
+++ b/ace/Proactor.cpp
@@ -159,7 +159,7 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (TIMER_QUEUE &timer_queue,
time,
handle);
// If Proactor event is valid, signal it
- if (handle != ACE_INVALID_HANDLE ||
+ if (handle != ACE_INVALID_HANDLE &&
handle != 0)
ACE_OS::event_signal (&handle);