*** empty log message ***

8 files changed, 20 insertions, 13 deletions

diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
index 976a43088b8..db7d58ba2f7 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
@@ -48,11 +48,9 @@ namespace CIAO
     <COMP_SVNT, COMP_EXEC, COMP_EXEC_VAR, 
      EXEC, EXEC_VAR, COMP>::destroy (PortableServer::ObjectId &oid)
   {
-    ACE_DEBUG ((LM_DEBUG, "i am being called to destroy\n"));
     COMP_SVNT *servant;
     if (this->servant_map_.find (oid, servant) == 0)
       {
-        ACE_DEBUG ((LM_DEBUG, "i found the servant\n"));
         servant->remove ();
       }
   }
diff --git a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
index 1fd923a8657..d10336225bd 100644
--- a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
@@ -136,7 +136,6 @@ namespace CIAO
         ACE_DEBUG ((LM_DEBUG, "Invalid component object reference\n"));
         return;
       }
-    ACE_DEBUG ((LM_DEBUG, "updated the map\n"));
     return;
   }
 
diff --git a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
index 9a50c53e26f..e93a3315c14 100644
--- a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
+++ b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
@@ -442,6 +442,7 @@ CIAO::NodeApplication_Impl::remove_components (ACE_ENV_SINGLE_ARG_DECL)
   }
 
   this->component_map_.unbind_all ();
+
   // To this point the servant should have been destroyed. However,
   // if someone is still making calls on the servant, terrible thing
   // will happen.
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
index d3235e33d4d..31755a74db2 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
@@ -68,26 +68,18 @@ namespace CIAO
     Components::SessionComponent_var temp = this->get_executor ();
     temp->ccm_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-    ACE_DEBUG ((LM_DEBUG, "called passivate\n"));
-
     CORBA::Object_var objref =
       this->container_->get_objref (this);
 
-    ACE_DEBUG ((LM_DEBUG, "got the object's reference\n"));
-
     Components::CCMObject_var ccmobjref =
       Components::CCMObject::_narrow (objref.in ()
                                       ACE_ENV_ARG_PARAMETER);
-    ACE_DEBUG ((LM_DEBUG, "got the ccm object's reference\n"));
     PortableServer::ObjectId_var oid;
 
     this->container_->uninstall_component ( ccmobjref.in (),
                                             oid.out ()
                                             ACE_ENV_ARG_PARAMETER);
-    ACE_DEBUG ((LM_DEBUG, "called uninstall\n"));
     this->home_servant_->update_component_map (oid);
-    ACE_DEBUG ((LM_DEBUG, "called update\n"));
-
   }
 
   ::Components::ConnectionDescriptions *
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp
index 6ee8cdde15d..277f883a620 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp
@@ -230,7 +230,6 @@ namespace CIAO
     )
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_DEBUG ((LM_DEBUG, "i am about to passivate\n"));
     // @@ Jai, could you please see why this is required?
     ::Components::SessionComponent_var temp =
       ::Components::SessionComponent::_narrow (
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
index 3ca30bcf8fc..6f5b35e5b61 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
@@ -246,6 +246,21 @@ namespace CIAO
 
   }
 
+  void
+  Swapping_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref
+                                          ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    PortableServer::POA_ptr tmp = this->home_servant_poa_.in ();
+    PortableServer::ObjectId_var oid =
+      tmp->reference_to_id (homeref
+                            ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
+
+    tmp->deactivate_object (oid.in ()
+                            ACE_ENV_ARG_PARAMETER);
+  }
+
   CORBA::Object_ptr
   Swapping_Container::install_servant (PortableServer::Servant p,
                                       Container::OA_Type t
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.h b/TAO/CIAO/DAnCE/ciao/Swapping_Container.h
index 94e9e2da45c..37b5f224e70 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.h
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.h
@@ -59,6 +59,10 @@ namespace CIAO
                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
+    virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
     virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p
                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
index 2003fca02fa..01e8a6d83c8 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -249,7 +249,6 @@ namespace CIAO
         ACE_DEBUG ((LM_DEBUG, "Invalid component object reference\n"));
         return;
       }
-    ACE_DEBUG ((LM_DEBUG, "updated the map\n"));
     return;
   }