diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2005-01-31 19:38:34 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2005-01-31 19:38:34 +0000 |
| commit | 4acc76414ce7040877f2e04d45a9c6e979850228 (patch) | |
| tree | 0cf0a3861e7dcb35a72581dc5a6ab2c324752f97 | |
| parent | 69f15fa0962ee9587b8581d1f5fda548f902161a (diff) | |
| download | ATCD-4acc76414ce7040877f2e04d45a9c6e979850228.tar.gz | |
ChangeLogTag:Mon Jan 31 13:37:48 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ace/Acceptor.cpp | 21 |
2 files changed, 16 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 4cecc8de687..a792613ddf1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jan 31 13:37:48 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu> + + * ace/Acceptor.cpp (handle_close): Fixed the code so that it + closes down properly. Thanks to Kobi Cohen-Arazi + <kobi.cohenarazi@gmail.com> for this fix. + Mon Jan 31 11:14:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Service_Config.h: diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp index 4f343653905..f187980c14f 100644 --- a/ace/Acceptor.cpp +++ b/ace/Acceptor.cpp @@ -925,19 +925,18 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE delete this->concurrency_strategy_; this->delete_concurrency_strategy_ = 0; this->concurrency_strategy_ = 0; + } + // Note that if we aren't actually registered with the + // ACE_Reactor then it's ok for this call to fail... - // Note that if we aren't actually registered with the - // ACE_Reactor then it's ok for this call to fail... - - if (this->reactor ()) - this->reactor ()->remove_handler - (this, - ACE_Event_Handler::ACCEPT_MASK | ACE_Event_Handler::DONT_CALL); + if (this->reactor ()) + this->reactor ()->remove_handler + (this, + ACE_Event_Handler::ACCEPT_MASK | ACE_Event_Handler::DONT_CALL); - if (this->peer_acceptor_.close () == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("close\n"))); - } + if (this->peer_acceptor_.close () == -1) + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("close\n"))); return 0; } |