diff options
| author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-01-19 00:14:02 +0000 |
|---|---|---|
| committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-01-19 00:14:02 +0000 |
| commit | 152bc53c5a11a3fdceaf3a41b42932e1082a9104 (patch) | |
| tree | c0aee95a8347aeef9b5c9add6bad096712673840 | |
| parent | c35e2f6ec68d6037c28ec31da1fe1b4f8e52a60f (diff) | |
| download | ATCD-152bc53c5a11a3fdceaf3a41b42932e1082a9104.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Context_Impl_T.cpp | 14 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp | 1 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp | 3 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Swapping_Container.inl | 1 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp | 3 |
5 files changed, 21 insertions, 1 deletions
diff --git a/TAO/CIAO/DAnCE/ciao/Context_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Context_Impl_T.cpp index da166b8d174..142f0a39744 100644 --- a/TAO/CIAO/DAnCE/ciao/Context_Impl_T.cpp +++ b/TAO/CIAO/DAnCE/ciao/Context_Impl_T.cpp @@ -43,14 +43,26 @@ namespace CIAO { if (CORBA::is_nil (this->component_.in ())) { - CORBA::Object_var obj = + ACE_DEBUG ((LM_DEBUG, "i am about to call get_CCM_object ()\n")); + + CORBA::Object_var obj; + ACE_TRY { + if (this->servant_ == 0) ACE_DEBUG ((LM_DEBUG, "Cranky \n")); + obj = this->container_->get_objref (this->servant_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); + } + ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Caught Exception \n"); return 0;} + ACE_ENDTRY; + + ACE_DEBUG ((LM_DEBUG, "got the object ref\n")); this->component_ = COMP::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); + ACE_DEBUG ((LM_DEBUG, "got the component\n")); if (CORBA::is_nil (this->component_.in ())) { diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp index c2798a31f8e..70d82aba716 100644 --- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp +++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp @@ -25,6 +25,7 @@ namespace CIAO ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { + ACE_DEBUG ((LM_DEBUG, "i am being called to incarnate\n")); Dynamic_Component_Servant_Base* servant = 0; PortableServer::ObjectId new_oid (oid); diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp index b64f9c7b9dc..3bff167017f 100644 --- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp +++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp @@ -96,6 +96,9 @@ namespace CIAO COMP_SVNT *svt = new COMP_SVNT(ciao_comp.in (), this->home_.in (), this->home_servant_, this->container_); + + ACE_DEBUG ((LM_DEBUG, "after calling the session context\n")); + if (component_removed_ == 1) { svt->ciao_preactivate (); diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.inl b/TAO/CIAO/DAnCE/ciao/Swapping_Container.inl index b2c00a33346..b73c381e6d5 100644 --- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.inl +++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.inl @@ -5,6 +5,7 @@ CIAO::Swapping_Container::get_objref (PortableServer::Servant p ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { + ACE_DEBUG ((LM_DEBUG, "calling container's objref\n")); return this->the_POA ()->servant_to_reference (p ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp index e198948e955..6d9554e0b62 100644 --- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp +++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp @@ -82,6 +82,9 @@ Sender_Impl::Sender_exec_1_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, "Sender_Impl::Sender_exec_1_i::ccm_activate\n")); + + CORBA::Object_var o = + this->context_->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER); } void |