diff options
author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-01-16 22:24:11 +0000 |
---|---|---|
committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-01-16 22:24:11 +0000 |
commit | 32607d7ef36d5b017f0c2dbbcc56d8ff547416bd (patch) | |
tree | 2220aa41b3a156a881d245fdf26c9028e3097ecd | |
parent | 284fddc8f986779bb2bf23407e830241ba878d87 (diff) | |
download | ATCD-32607d7ef36d5b017f0c2dbbcc56d8ff547416bd.tar.gz |
*** empty log message ***
-rw-r--r-- | TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp | 1 | ||||
-rw-r--r-- | TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp | 2 | ||||
-rw-r--r-- | TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp | 5 | ||||
-rw-r--r-- | TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp | 3 |
4 files changed, 10 insertions, 1 deletions
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp index 0894ffeb84a..28b212d02d4 100644 --- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp +++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp @@ -65,6 +65,7 @@ namespace CIAO if (this->servant_map_.find (oid, servant) == 0) { servant->remove (); + ACE_DEBUG ((LM_DEBUG, "called the remove on the servant\n")); component_removed_ = 1; } } diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp index 31755a74db2..6467ae48a9a 100644 --- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp +++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp @@ -68,6 +68,8 @@ namespace CIAO Components::SessionComponent_var temp = this->get_executor (); temp->ccm_passivate (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_DEBUG ((LM_DEBUG, "i called the remove from the servant base \n")); + CORBA::Object_var objref = this->container_->get_objref (this); diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp index 087e269815b..85d067f2388 100644 --- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp +++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp @@ -250,14 +250,19 @@ namespace CIAO ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { + ACE_DEBUG ((LM_DEBUG , " i am being called to uninstall\n")); + ACE_DEBUG ((LM_DEBUG , " i am being called to uninstall\n")); PortableServer::POA_ptr tmp = this->home_servant_poa_.in (); + ACE_DEBUG ((LM_DEBUG , " i am being called to uninstall\n")); PortableServer::ObjectId_var oid = tmp->reference_to_id (homeref ACE_ENV_ARG_PARAMETER); ACE_CHECK; + ACE_DEBUG ((LM_DEBUG , " i am being called to uninstall\n")); tmp->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); + ACE_DEBUG ((LM_DEBUG , " i am being called to uninstall\n")); } CORBA::Object_ptr 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 b9a8c9f2427..abfeeea390a 100644 --- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp +++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp @@ -60,7 +60,7 @@ namespace CIAO this->dynamic_servant_map_.begin (); iter != end; ++iter) { - (*iter).int_id_->destroy (oid); + // (*iter).int_id_->destroy (oid); } } @@ -89,6 +89,7 @@ namespace CIAO ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)) { + ACE_DEBUG ((LM_DEBUG, "i am being called to remove the component\n")); PortableServer::ObjectId_var oid = PortableServer::string_to_ObjectId (this->obj_id_); |