diff options
author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-01-20 17:43:13 +0000 |
---|---|---|
committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-01-20 17:43:13 +0000 |
commit | 6cfa1c041f7217cd312cd0b96af434226348a367 (patch) | |
tree | aa23af3db8fed90b3a3043f5ebe894469c98d2d4 | |
parent | 58bb3b15a5537b0780eae9a135cc2d18183a43e9 (diff) | |
download | ATCD-6cfa1c041f7217cd312cd0b96af434226348a367.tar.gz |
*** empty log message ***
-rw-r--r-- | TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp | 5 | ||||
-rw-r--r-- | TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp | 10 | ||||
-rw-r--r-- | TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp | 1 | ||||
-rw-r--r-- | TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp | 12 |
4 files changed, 24 insertions, 4 deletions
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp index 3bff167017f..053cb482d52 100644 --- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp +++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp @@ -79,8 +79,6 @@ namespace CIAO <COMP_SVNT, COMP_EXEC, COMP_EXEC_VAR, EXEC, EXEC_VAR, COMP>::create (PortableServer::ObjectId &oid) { - ACE_DEBUG ((LM_DEBUG, - "i am being asked to create a new servant here\n\n")); CIAO::Swap_Exec_var swap_exec = CIAO::Swap_Exec::_narrow (this->executor_.in () ACE_ENV_ARG_PARAMETER); @@ -97,8 +95,6 @@ namespace CIAO this->home_servant_, this->container_); - ACE_DEBUG ((LM_DEBUG, "after calling the session context\n")); - if (component_removed_ == 1) { svt->ciao_preactivate (); @@ -106,6 +102,7 @@ namespace CIAO svt->ciao_postactivate (); component_removed_ = 0; } + PortableServer::ServantBase_var safe (svt); this->servant_map_.bind (oid, svt); return safe._retn (); diff --git a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp index e93a3315c14..44f8a84f158 100644 --- a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp +++ b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp @@ -22,6 +22,7 @@ CIAO::NodeApplication_Impl::finishLaunch ( { ACE_TRY { + ACE_DEBUG ((LM_DEBUG, "i am here to finish launch\n")); const CORBA::ULong length = providedReference.length (); // For every connection struct we finish the connection. @@ -190,10 +191,14 @@ CIAO::NodeApplication_Impl::install ( for (CORBA::ULong i = 0; i < len; ++i) { + + ACE_DEBUG ((LM_DEBUG, "about to install home\n")); home = this->install_home (impl_infos[i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; + ACE_DEBUG ((LM_DEBUG, "installed the home\n")); + Components::KeylessCCMHome_var kh = Components::KeylessCCMHome::_narrow (home.in () ACE_ENV_ARG_PARAMETER); @@ -204,9 +209,12 @@ CIAO::NodeApplication_Impl::install ( // @@ Note, here we are missing the CreateFailure. // Sometime I will come back to add exception rethrow. + ACE_DEBUG ((LM_DEBUG, "creating the component\n")); comp = kh->create_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; + ACE_DEBUG ((LM_DEBUG, "created the component\n")); + if (this->component_map_.bind (impl_infos[i].component_instance_name.in (), Components::CCMObject::_duplicate (comp.in ()))) ACE_TRY_THROW (Deployment::InstallationFailure ()); @@ -217,6 +225,8 @@ CIAO::NodeApplication_Impl::install ( (*retv)[i].component_ref = Components::CCMObject::_duplicate (comp.in ()); + ACE_DEBUG ((LM_DEBUG, "duplicated the component\n")); + // Deal with Component instance related Properties. // Now I am only concerning about the COMPOENTIOR and here is only // the hardcoded version of the configuration. Hopefully we will diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp index 277f883a620..2f0b84ccc5f 100644 --- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp +++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp @@ -162,6 +162,7 @@ namespace CIAO ) ACE_THROW_SPEC ((CORBA::SystemException)) { + ACE_DEBUG ((LM_DEBUG, "BEING CALLED\n")); ::Components::SessionComponent_var temp = ::Components::SessionComponent::_narrow ( this->executor_.in () 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 201cc92b2f3..09d09b5dc5c 100644 --- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp +++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp @@ -161,6 +161,8 @@ namespace CIAO this->executor_->create (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (COMP::_nil ()); + ACE_DEBUG ((LM_DEBUG, "created the home succesfully\n")); + return this->_ciao_activate_component (_ciao_ec.in () ACE_ENV_ARG_PARAMETER); } @@ -215,14 +217,24 @@ namespace CIAO <COMP_SVNT, COMP_EXEC, COMP_EXEC_VAR, EXEC, EXEC_VAR, COMP> (ec, home, this, this->container_); + ACE_DEBUG ((LM_DEBUG, "created a servant\n")); + this->container_->add_servant_map (oid, svt); this->dynamic_servant_map_.bind (oid, svt); + ACE_DEBUG ((LM_DEBUG, "added the servant to maps\n")); + + ACE_DEBUG ((LM_DEBUG, "trying to narrow the component reference\n")); + COMP_VAR ho = COMP::_narrow (objref.in () ACE_ENV_ARG_PARAMETER); + + ACE_DEBUG ((LM_DEBUG, "narrowed the component reference\n")); + ACE_CHECK_RETURN (COMP::_nil ()); + ACE_DEBUG ((LM_DEBUG, "lets return\n")); return ho._retn (); } |