diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-06-28 12:13:16 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-06-28 12:13:16 +0000 |
| commit | d70ee48f94da3ada80e2e741a9cb6e78f9a59292 (patch) | |
| tree | fbb3a9b11a60abdbc64cf4a72c2504d855c51020 | |
| parent | 801d48c6954bf97aaff3d628ee4e8076cdfdba55 (diff) | |
| download | ATCD-d70ee48f94da3ada80e2e741a9cb6e78f9a59292.tar.gz | |
ChangeLogTag: Thu Jun 28 07:08:26 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 9 | ||||
| -rw-r--r-- | ace/TP_Reactor.cpp | 5 |
4 files changed, 31 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index d85b2ceef02..230776327ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Thu Jun 28 07:08:26 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/TP_Reactor.cpp: Added a sanity check. The check involves + invalidating the handle when the handler is removed from the + repository in notify_handle (). We also check for an invalid + handle before we go ahead and resume the handle. Thanks to + Alexander Libman <alexander.libman@baltimore.com> for suggesting + this check. + Wed Jun 27 14:07:43 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> * ace/CDR_Stream.{cpp,h}: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index d85b2ceef02..230776327ac 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,12 @@ +Thu Jun 28 07:08:26 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/TP_Reactor.cpp: Added a sanity check. The check involves + invalidating the handle when the handler is removed from the + repository in notify_handle (). We also check for an invalid + handle before we go ahead and resume the handle. Thanks to + Alexander Libman <alexander.libman@baltimore.com> for suggesting + this check. + Wed Jun 27 14:07:43 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> * ace/CDR_Stream.{cpp,h}: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index d85b2ceef02..230776327ac 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,12 @@ +Thu Jun 28 07:08:26 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/TP_Reactor.cpp: Added a sanity check. The check involves + invalidating the handle when the handler is removed from the + repository in notify_handle (). We also check for an invalid + handle before we go ahead and resume the handle. Thanks to + Alexander Libman <alexander.libman@baltimore.com> for suggesting + this check. + Wed Jun 27 14:07:43 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> * ace/CDR_Stream.{cpp,h}: diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp index 4938ee50338..24f12f1fe65 100644 --- a/ace/TP_Reactor.cpp +++ b/ace/TP_Reactor.cpp @@ -146,7 +146,8 @@ ACE_TP_Reactor::handle_events (ACE_Time_Value *max_wait_time) dispatch_info.event_handler_->resume_handler (); } - if (dispatch_info.event_handler_ != this->notify_handler_ && + if (dispatch_info.handle_ != ACE_INVALID_HANDLE && + dispatch_info.event_handler_ != this->notify_handler_ && flag == 0) this->resume_handler (dispatch_info.handle_); } @@ -423,6 +424,8 @@ ACE_TP_Reactor::notify_handle (ACE_EH_Dispatch_Info &dispatch_info) // As the handler is no longer valid, invalidate the handle dispatch_info.event_handler_ = 0; + dispatch_info.handle_ = ACE_INVALID_HANDLE; + return retval; } |