diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-25 05:03:43 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-25 05:03:43 +0000 |
| commit | 8aac60492ba5b741d460a5eca2a707e605f71147 (patch) | |
| tree | d1d36eeb49b9d0525b8b5d82bd725242957847ac /TAO/tao/Adapter.cpp | |
| parent | 9d2ca5ae0acbfc3c44936859f1f67ace2b03ccab (diff) | |
| download | ATCD-8aac60492ba5b741d460a5eca2a707e605f71147.tar.gz | |
ChangeLogTag: Tue Oct 24 23:40:33 2000 Irfan Pyarali <irfan@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/Adapter.cpp')
| -rw-r--r-- | TAO/tao/Adapter.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp index 396e50742c8..487ae4cee4f 100644 --- a/TAO/tao/Adapter.cpp +++ b/TAO/tao/Adapter.cpp @@ -31,8 +31,11 @@ TAO_Adapter_Registry::TAO_Adapter_Registry (TAO_ORB_Core *oc) TAO_Adapter_Registry::~TAO_Adapter_Registry (void) { - // Deallocate adapter array in case the registry was not closed - // properly. + for (size_t i = 0; i != this->adapters_count_; ++i) + { + delete this->adapters_[i]; + } + delete[] this->adapters_; } @@ -45,10 +48,6 @@ TAO_Adapter_Registry::close (int wait_for_completion, this->adapters_[i]->close (wait_for_completion, ACE_TRY_ENV); ACE_CHECK; } - delete[] this->adapters_; - this->adapters_ = 0; - this->adapters_capacity_ = 0; - this->adapters_count_ = 0; } void |