diff options
author | Steve Huston <shuston@riverace.com> | 2005-02-15 23:07:37 +0000 |
---|---|---|
committer | Steve Huston <shuston@riverace.com> | 2005-02-15 23:07:37 +0000 |
commit | 34104cf059eeafbd1382ac7f9315e0c9a4afac2e (patch) | |
tree | 929cad045679537bffe42e0311c7d1ac90539359 /ace/Acceptor.cpp | |
parent | 2cf1b9573c6f58e31ad17124620d11875cf8dab9 (diff) | |
download | ATCD-34104cf059eeafbd1382ac7f9315e0c9a4afac2e.tar.gz |
Commit merged-in changes from mainlinePROACTOR_FIXES_STEVE_JAN05
Diffstat (limited to 'ace/Acceptor.cpp')
-rw-r--r-- | ace/Acceptor.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
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; } |