diff options
author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-08-15 21:02:08 +0000 |
---|---|---|
committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-08-15 21:02:08 +0000 |
commit | 904acd6d6850c87dd2ce8735a548b7a0398c99d0 (patch) | |
tree | 92e655d7c1522a0e73e5dffd4456ef407e8509fd | |
parent | a4c4eb532846f36e8c67dd2ca047eb3a2469d173 (diff) | |
download | ATCD-904acd6d6850c87dd2ce8735a548b7a0398c99d0.tar.gz |
ChangeLogTag:Wed Aug 15 15:50:38 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-02a | 6 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
-rw-r--r-- | ace/WFMO_Reactor.cpp | 5 |
4 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index de4143a20bd..9034fa781b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Aug 15 15:50:38 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/WFMO_Reactor.cpp: Don't try to purge the notifications if + notify_handler_ is 0. Thanks to Edan Ayal + <edanayal@hotmail.com> for reporting this. + Wed Aug 15 11:33:26 2001 Carlos O'Ryan <coryan@uci.edu> * bin/nightlybuilds/builds.lst: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index de4143a20bd..9034fa781b5 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Wed Aug 15 15:50:38 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/WFMO_Reactor.cpp: Don't try to purge the notifications if + notify_handler_ is 0. Thanks to Edan Ayal + <edanayal@hotmail.com> for reporting this. + Wed Aug 15 11:33:26 2001 Carlos O'Ryan <coryan@uci.edu> * bin/nightlybuilds/builds.lst: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index de4143a20bd..9034fa781b5 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Wed Aug 15 15:50:38 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/WFMO_Reactor.cpp: Don't try to purge the notifications if + notify_handler_ is 0. Thanks to Edan Ayal + <edanayal@hotmail.com> for reporting this. + Wed Aug 15 11:33:26 2001 Carlos O'Ryan <coryan@uci.edu> * bin/nightlybuilds/builds.lst: diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp index c65a6dee4ae..81359ee54a5 100644 --- a/ace/WFMO_Reactor.cpp +++ b/ace/WFMO_Reactor.cpp @@ -2497,7 +2497,10 @@ ACE_WFMO_Reactor::purge_pending_notifications (ACE_Event_Handler *eh, ACE_Reactor_Mask mask) { ACE_TRACE ("ACE_WFMO_Reactor::purge_pending_notifications"); - return this->notify_handler_->purge_pending_notifications (eh, mask); + if (this->notify_handler_ == 0) + return 0; + else + return this->notify_handler_->purge_pending_notifications (eh, mask); } int |