Fri May 27 23:35:23 2005 Jaiganesh B <jai@dre.vanderbilt.edu>

5 files changed, 22 insertions, 11 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index feac2c50720..b9285f4be3b 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Fri May 27 23:35:23 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
+
+	* DAnCE/ciao/Container_Impl.cpp:
+	* DAnCE/ciao/Container_Impl.h:
+	* DAnCE/ciao/Home_Servant_Impl_T.cpp:
+	* DAnCE/ciao/Home_Servant_Impl_T.h:
+
+	Changed the structure of the utility maps that maintain
+	the component references, to use "_var" instead of "_ptr"
+	in order to facilitate effective memory destructions.
+
 Fri May 27 20:26:33 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
 
         * CCF/CCF/CCF.sln:
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Impl.cpp b/TAO/CIAO/DAnCE/ciao/Container_Impl.cpp
index 80663302954..a8c244aeffe 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Impl.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Container_Impl.cpp
@@ -347,10 +347,10 @@ CIAO::Container_Impl::remove_components (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW (CORBA::BAD_PARAM ());
 
     // This will call ccm_passivate on the component executor.
-    home->remove_component ((*iter).int_id_);
+    home->remove_component (((*iter).int_id_).in ());
     ACE_CHECK;
 
-    CORBA::release ((*iter).int_id_);
+    CORBA::release (((*iter).int_id_).in ());
   }
 
   this->component_map_.unbind_all ();
@@ -367,7 +367,7 @@ CIAO::Container_Impl::remove_component (const char * comp_ins_name
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::RemoveFailure))
 {
-  Components::CCMObject_ptr comp;
+  Components::CCMObject_var comp;
   Components::CCMHome_ptr home;
 
   ACE_CString str (comp_ins_name);
@@ -386,11 +386,11 @@ CIAO::Container_Impl::remove_component (const char * comp_ins_name
     ACE_THROW (CORBA::BAD_PARAM ());
 
   // This will call ccm_passivate on the component executor.
-  home->remove_component (comp);
+  home->remove_component (comp.in ());
   ACE_CHECK;
 
   // If the previous calls failed, what should we do here??
-  CORBA::release (comp);
+  CORBA::release (comp.in ());
 
   // @@ Still need to remove the home if the previous operation fails?
   if (this->component_map_.unbind (str) == -1)
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Impl.h b/TAO/CIAO/DAnCE/ciao/Container_Impl.h
index 85666635d38..8e616108ae6 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Impl.h
+++ b/TAO/CIAO/DAnCE/ciao/Container_Impl.h
@@ -191,7 +191,7 @@ protected:
     /// To store all created Component object.
     // @@Gan, see how this caching is duplicated..
     typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                    Components::CCMObject_ptr,
+                                    Components::CCMObject_var,
                                     ACE_Hash<ACE_CString>,
                                     ACE_Equal_To<ACE_CString>,
                                     ACE_Null_Mutex> CCMComponent_Map;
diff --git a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
index 036aead45a8..adebb4ffee1 100644
--- a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
@@ -58,7 +58,7 @@ namespace CIAO
            this->objref_map_.begin ();
          iter != end; ++iter)
       {
-        this->remove_component ((*iter).int_id_);
+        this->remove_component (((*iter).int_id_).in ());
       }
   }
 
@@ -92,15 +92,15 @@ namespace CIAO
                                                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    Components::CCMObject_ptr ccm_obj_ptr = Components::CCMObject::_nil ();
-    if (objref_map_.find (oid.in (), ccm_obj_ptr) != 0)
+    Components::CCMObject_var ccm_obj_var = Components::CCMObject::_nil ();
+    if (objref_map_.find (oid.in (), ccm_obj_var) != 0)
       {
         ACE_DEBUG ((LM_DEBUG, "Invalid component object reference\n"));
         return;
       }
 
     COMP_VAR _ciao_comp =
-      COMP::_narrow (ccm_obj_ptr
+      COMP::_narrow (ccm_obj_var.in ()
                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
diff --git a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.h b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.h
index f9484fe80c3..8af0d9e8c87 100644
--- a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.h
+++ b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.h
@@ -103,7 +103,7 @@ namespace CIAO
     EXEC_VAR executor_;
 
     typedef ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId,
-                                    Components::CCMObject_ptr,
+                                    Components::CCMObject_var,
                                     TAO_ObjectId_Hash,
                                     ACE_Equal_To<PortableServer::ObjectId>,
                                     ACE_SYNCH_MUTEX>