diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-04-17 21:10:58 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-04-17 21:10:58 +0000 |
| commit | b66d2fc616af5111c8eb180b0ea90e455577f54a (patch) | |
| tree | ac664d69972b3cd0c337337783116813de621cf2 | |
| parent | 0b737d740fe20a96d998e0e0ee74815d969dbe2d (diff) | |
| download | ATCD-b66d2fc616af5111c8eb180b0ea90e455577f54a.tar.gz | |
ChangeLogTag:Tue Apr 17 15:48:20 2001 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 9 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Connection_Handler.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp | 3 | ||||
| -rw-r--r-- | TAO/tao/Strategies/UIOP_Connection_Handler.cpp | 4 |
4 files changed, 12 insertions, 8 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 2f2b4efd858..2baf70fa9f6 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,12 @@ +Tue Apr 17 15:48:20 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * tao/IIOP_Connection_Handler.cpp (handle_close): + * tao/Strategies/UIOP_Connection_Handler.cpp (handle_close): + * tao/Strategies/SHMIOP_Connection_Handler.cpp (handle_close): The + handle_close methods were not closing these Svc_Handler's down + properly. Removed "this->peer ()->close ()" calls and use + "this->destroy () instead of calling "delete this." + Tue Apr 17 15:43:45 2001 Nanbor Wang <nanbor@cs.wustl.edu> * examples/POA/TIE/client.dsp: Removed FooS.* from project. diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index 44843cb79e5..0ee060fa2e4 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -247,13 +247,11 @@ TAO_IIOP_Connection_Handler::handle_close (ACE_HANDLE handle, // a reference to it. This will eventually call // TAO_Transport::release (). this->transport (0); - - this->peer ().close (); } // Follow usual Reactor-style lifecycle semantics and commit // suicide. - delete this; + this->destroy (); } return 0; diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp index 4daca3fa5a0..d2b99bec1dc 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp @@ -226,10 +226,9 @@ TAO_SHMIOP_Connection_Handler::handle_close (ACE_HANDLE handle, this->transport (0); this->peer ().cleanup (1); - this->peer ().close (); } - delete this; + this->destroy (); } return 0; diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp index 90531f85db2..113f4925512 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp @@ -206,11 +206,9 @@ TAO_UIOP_Connection_Handler::handle_close (ACE_HANDLE handle, // a reference to it. This will eventually call // TAO_Transport::release (). this->transport (0); - - this->peer ().close (); } - delete this; + this->destroy (); } return 0; |