summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2005-10-21 03:22:11 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2005-10-21 03:22:11 +0000
commit84d024fae27152db1561e85ce42b3a560af76c5b (patch)
tree6ab534f481311ad60ada2b479af1fb671a1ca39f
parent436ee7792d58c1c7eec36c978ebf13a21ce4e4c5 (diff)
downloadATCD-84d024fae27152db1561e85ce42b3a560af76c5b.tar.gz
ChangeLogTag:Thu Oct 20 22:20:26 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu>
-rw-r--r--ChangeLog6
-rw-r--r--THANKS1
-rw-r--r--ace/Dev_Poll_Reactor.cpp9
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d6da8f60aad..ca0b7a11263 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Oct 20 22:20:26 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu>
+
+ * ace/Dev_Poll_Reactor.cpp (open): Disabling the notify pipe was
+ failing, but now it works. Thanks to Oh Yoon Sik <boom at
+ estsoft dot com> for this fix.
+
Thu Oct 29 14:36:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/CDR_Base.cpp:
diff --git a/THANKS b/THANKS
index 4fa19ed78d0..7aca89c8c47 100644
--- a/THANKS
+++ b/THANKS
@@ -2031,6 +2031,7 @@ Francesco Salvestrini <f dot salvestrini at nextworks dot it>
Scooter <im-scooter at yandex.ru>
Sandeep Deshpande <sandeep dot bvb at gmail dot com>
Hubert Talbot <Hubert dot Talbot at criq dot qc dot ca>
+Oh Yoon Sik <boom at estsoft dot com>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson in the early 1990's. Paul devised the recursive Makefile
diff --git a/ace/Dev_Poll_Reactor.cpp b/ace/Dev_Poll_Reactor.cpp
index f77946589f2..016efdad93d 100644
--- a/ace/Dev_Poll_Reactor.cpp
+++ b/ace/Dev_Poll_Reactor.cpp
@@ -906,10 +906,11 @@ ACE_Dev_Poll_Reactor::open (size_t size,
else if (this->notify_handler_->open (this,
0,
disable_notify_pipe) == -1
- || this->register_handler_i (
- this->notify_handler_->notify_handle (),
- this->notify_handler_,
- ACE_Event_Handler::READ_MASK) == -1)
+ || (disable_notify_pipe == 0
+ && this->register_handler_i (
+ this->notify_handler_->notify_handle (),
+ this->notify_handler_,
+ ACE_Event_Handler::READ_MASK)) == -1)
result = -1;
this->size_ = size;