diff options
| author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-22 21:51:58 +0000 |
|---|---|---|
| committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-22 21:51:58 +0000 |
| commit | 52af092c19dc772fb4a827412a262f59beef1ecd (patch) | |
| tree | 059faf613b3fa10fd85783439f539ffeab66f616 | |
| parent | f45dc9dbacb900c3181a012a330cfdc37fc26880 (diff) | |
| download | ATCD-52af092c19dc772fb4a827412a262f59beef1ecd.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Container_Base.cpp | 1 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp | 2 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp | 10 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp | 1 |
4 files changed, 11 insertions, 3 deletions
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp index f1fce5ec95f..ac62554d19b 100644 --- a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp +++ b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp @@ -389,7 +389,6 @@ namespace CIAO ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - PortableServer::ObjectId_var id = this->component_poa_->reference_to_id (objref ACE_ENV_ARG_PARAMETER); diff --git a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp index 9a50c53e26f..8a30ff0e873 100644 --- a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp +++ b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp @@ -391,7 +391,7 @@ CIAO::NodeApplication_Impl::init (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_THROW_EX (this->container_, - CIAO::Swapping_Container (this->orb_.in ()), + CIAO::Session_Container (this->orb_.in (), 0, 0), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (-1); diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp index b19a5de1f95..b37b07b124c 100644 --- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp +++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp @@ -61,7 +61,15 @@ namespace CIAO ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)) { - // CIAO to-do + CORBA::Object_var objref = this->container_->get_objref (this); + Components::CCMObject_var ccmobjref = + Components::CCMObject::_narrow (objref.in () + ACE_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var oid; + this->container_->uninstall_component + (ccmobjref.in (), + oid.out () + ACE_ENV_ARG_PARAMETER); } ::Components::ConnectionDescriptions * 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 f0506d4058c..6420f7905f9 100644 --- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp +++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp @@ -252,6 +252,7 @@ namespace CIAO ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid; + this->container_->uninstall_component (comp, oid.out () ACE_ENV_ARG_PARAMETER); |