diff options
| author | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-11-22 21:05:35 +0000 |
|---|---|---|
| committer | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-11-22 21:05:35 +0000 |
| commit | b2e92c5cb9f65acfae4df75c75e34d8f8cb8b9c5 (patch) | |
| tree | cdb0807a8774d57a255ba3cc4cd4b1fb0c9b58f6 | |
| parent | 875a49c073a1fc832e9a6b6fdeff0054c0d94735 (diff) | |
| download | ATCD-b2e92c5cb9f65acfae4df75c75e34d8f8cb8b9c5.tar.gz | |
Tue Nov 22 16:03:24 2005 Gan Deng <gan.deng@vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/NodeApplication/Container_Impl.cpp | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 8ba3b58b858..fe0c16b2187 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Nov 22 16:03:24 2005 Gan Deng <gan.deng@vanderbilt.edu> + + * DAnCE/NodeApplication/Container_Impl.cpp + + Fixed a memory management related bug, we should not + explicitly call release() on the component object + reference of var type. + Mon Nov 21 17:24:42 2005 Boris Kolpackov <boris@kolpackov.net> * NEWS: diff --git a/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.cpp index 06899bbfcbc..30db3d0ba3a 100644 --- a/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.cpp +++ b/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.cpp @@ -425,7 +425,7 @@ CIAO::Container_Impl::remove_components (ACE_ENV_SINGLE_ARG_DECL) home->remove_component (((*iter).int_id_).in ()); ACE_CHECK; - CORBA::release (((*iter).int_id_).in ()); + //CORBA::release (((*iter).int_id_).in ()); } this->component_map_.unbind_all (); @@ -465,7 +465,6 @@ CIAO::Container_Impl::remove_component (const char * comp_ins_name ACE_CHECK; // If the previous calls failed, what should we do here?? - CORBA::release (comp.in ()); // @@ Still need to remove the home if the previous operation fails? if (this->component_map_.unbind (str) == -1) |