diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-05-08 16:16:11 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-05-08 16:16:11 +0000 |
| commit | ba6f7983cd231838182424321c7956a40366eb0e (patch) | |
| tree | 63b596b419698d44f43ddedcc5b72c0199231364 /TAO/tao/Object_Ref_Table.cpp | |
| parent | 3e62af49868aa617b78e6ffbfeb2d80c6702dbc3 (diff) | |
| download | ATCD-ba6f7983cd231838182424321c7956a40366eb0e.tar.gz | |
ChangeLogTag:Tue May 8 08:56:32 2001 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'TAO/tao/Object_Ref_Table.cpp')
| -rw-r--r-- | TAO/tao/Object_Ref_Table.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp index c363349772d..b9299716b1c 100644 --- a/TAO/tao/Object_Ref_Table.cpp +++ b/TAO/tao/Object_Ref_Table.cpp @@ -9,7 +9,9 @@ #include "CORBA_String.h" #include "debug.h" -ACE_RCSID(tao, Object_Ref_Table, "$Id$") +ACE_RCSID (tao, + Object_Ref_Table, + "$Id$") // **************************************************************** @@ -20,12 +22,9 @@ TAO_Object_Ref_Table::TAO_Object_Ref_Table (void) TAO_Object_Ref_Table::~TAO_Object_Ref_Table (void) { - // @@ We seem to be calling destroy () twice in normal - // circumstances. One from ORB_Core::shutdown () and another from - // here. Seems goofy in a first pass.. Bala - // this->destroy (); - - this->table_.close (); // Only call close() in this destructor! + // Must explicitly call destroy() in the destructor since not all + // applications will invoke ORB::shutdown() or ORB::destroy(). + this->destroy (); } void @@ -93,6 +92,8 @@ TAO_Object_Ref_Table::destroy (void) // Release the Object. CORBA::release ((*i).int_id_); } + + this->table_.unbind_all (); } TAO_Object_Ref_Table::Iterator |