diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-10-29 23:50:08 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-10-29 23:50:08 +0000 |
| commit | 832ab264678608a7fbb7f265948217914cd59bd1 (patch) | |
| tree | 327f9ce56380454a0f489b879b7b479a874626d3 | |
| parent | 91bff553f0b8704f4ce302d39170a9d0e90c8ed6 (diff) | |
| download | ATCD-832ab264678608a7fbb7f265948217914cd59bd1.tar.gz | |
ChangeLogTag: Mon Oct 29 17:49:21 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
| -rw-r--r-- | ace/TP_Reactor.cpp | 15 |
4 files changed, 27 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 514b4cd3e09..159ec59f0b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 29 17:49:21 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/TP_Reactor.cpp: Added some error checks at places where + token where acquired. + Mon Oct 29 16:59:58 2001 Balachandran Natarajan <bala@cs.wustl.edu> * ace/TP_Reactor.cpp (acquire_token): The acquire_token () called diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 514b4cd3e09..159ec59f0b5 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Mon Oct 29 17:49:21 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/TP_Reactor.cpp: Added some error checks at places where + token where acquired. + Mon Oct 29 16:59:58 2001 Balachandran Natarajan <bala@cs.wustl.edu> * ace/TP_Reactor.cpp (acquire_token): The acquire_token () called diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 514b4cd3e09..159ec59f0b5 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Mon Oct 29 17:49:21 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/TP_Reactor.cpp: Added some error checks at places where + token where acquired. + Mon Oct 29 16:59:58 2001 Balachandran Natarajan <bala@cs.wustl.edu> * ace/TP_Reactor.cpp (acquire_token): The acquire_token () called diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp index 0506dabcaf8..189ee57d357 100644 --- a/ace/TP_Reactor.cpp +++ b/ace/TP_Reactor.cpp @@ -185,7 +185,10 @@ ACE_TP_Reactor::remove_handler (ACE_Event_Handler *eh, ACE_TP_Token_Guard guard (this->token_); // Acquire the token - guard.acquire_token (); + int result = guard.acquire_token (); + + if (!guard.is_owner ()) + return result; // Call the remove_handler_i () with a DONT_CALL mask. We dont // want to call the handle_close with the token held. @@ -214,7 +217,10 @@ ACE_TP_Reactor::remove_handler (ACE_HANDLE handle, ACE_TP_Token_Guard guard (this->token_); // Acquire the token - guard.acquire_token (); + int result = guard.acquire_token (); + + if (!guard.is_owner ()) + return result; size_t slot = 0; eh = this->handler_rep_.find (handle, &slot); @@ -257,7 +263,10 @@ ACE_TP_Reactor::remove_handler (const ACE_Handle_Set &handles, ACE_TP_Token_Guard guard (this->token_); // Acquire the token - guard.acquire_token (); + int result = guard.acquire_token (); + + if (!guard.is_owner ()) + return result; ACE_HANDLE h; |