diff options
| author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-11 22:45:47 +0000 |
|---|---|---|
| committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-11 22:45:47 +0000 |
| commit | 54d6554f6cc7fb9e1f7cd22aa3a61ec7b3213b9f (patch) | |
| tree | cde61a77b58e351db94faf08ed7ec2778e905333 | |
| parent | 7c585f5650a1ec5ca50843c8385fc6a042805085 (diff) | |
| download | ATCD-54d6554f6cc7fb9e1f7cd22aa3a61ec7b3213b9f.tar.gz | |
*** empty log message ***
4 files changed, 17 insertions, 4 deletions
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp index 4229a199d47..18de97e2dee 100644 --- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp +++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp @@ -39,4 +39,10 @@ namespace CIAO /// Need to investigate what needs to be handled here.. } + void update_map (PortableServer::ObjectId &oid, + Dynamic_Component_Servant_Base* servant + ACE_ENV_ARG_DECL) + { + } + } diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.h b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.h index 00e27b31429..48171206fca 100644 --- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.h +++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.h @@ -72,6 +72,10 @@ namespace CIAO ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + void update_map (PortableServer::ObjectId &oid, + Dynamic_Component_Servant_Base* servant + ACE_ENV_ARG_DECL); + private: /// Pointer to our ORB CORBA::ORB_var orb_; diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Impl_T.cpp index 5b281bc29f4..b03c5ee7ed0 100644 --- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Impl_T.cpp +++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Impl_T.cpp @@ -27,6 +27,7 @@ namespace CIAO SWapping_Container * c ) : Swapping_Servant_Impl_Base (c), + activator_ (), executor_ (EXEC::_duplicate (exe)) { } @@ -201,10 +202,9 @@ namespace CIAO ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (COMP::_nil ()); - if (this->component_map_.bind (oid.in (), svt) == 0) - { - safe._retn (); - } + Dynamic_Component_Servant_Base *svt = new Dynamic_Servant_T<COMP_SVNT> (); + + this->activator_.update_map (oid.in (), svt); return ho._retn (); } diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Impl_T.h b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Impl_T.h index a7d936468c8..afb29cf8066 100644 --- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Impl_T.h +++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Impl_T.h @@ -19,6 +19,7 @@ #include /**/ "ace/pre.h" #include "Swapping_Servant_Impl_Base.h" +#include "Dynamic_Component_Activator.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -96,6 +97,8 @@ namespace CIAO protected: EXEC_VAR executor_; + Dynamic_Component_Activator activator_; + ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId, COMP_SVNT *, TAO_ObjectId_Hash, |