From ba2e8215f29cfee165e3072a08b9944d7bf959ac Mon Sep 17 00:00:00 2001 From: jai Date: Mon, 30 May 2005 17:21:00 +0000 Subject: Mon May 30 12:19:42 2005 Jaiganesh B --- TAO/CIAO/ChangeLog | 9 ++ TAO/CIAO/DAnCE/ciao/Port_Activator_T.cpp | 2 +- TAO/CIAO/DAnCE/ciao/Servant_Activator.cpp | 2 +- TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp | 133 ++++++++++++++---------------- 4 files changed, 73 insertions(+), 73 deletions(-) diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index b9285f4be3b..26fc5acc8aa 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,12 @@ +Mon May 30 12:19:42 2005 Jaiganesh B + + * DAnCE/ciao/Port_Activator_T.cpp: + * DAnCE/ciao/Servant_Activator.cpp: + * DAnCE/ciao/Servant_Impl_Base.cpp: + + Made use of ACE_ENV macros to fix Debian Full Reactor + build errors. + Fri May 27 23:35:23 2005 Jaiganesh B * DAnCE/ciao/Container_Impl.cpp: diff --git a/TAO/CIAO/DAnCE/ciao/Port_Activator_T.cpp b/TAO/CIAO/DAnCE/ciao/Port_Activator_T.cpp index 3cd741f9856..8b84e931f56 100644 --- a/TAO/CIAO/DAnCE/ciao/Port_Activator_T.cpp +++ b/TAO/CIAO/DAnCE/ciao/Port_Activator_T.cpp @@ -36,7 +36,7 @@ namespace CIAO void Port_Activator_T::deactivate ( const PortableServer::Servant servant - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL) { SERVANT *s = dynamic_cast (servant); s->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Activator.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Activator.cpp index 848656f5b85..2f255eea5e0 100644 --- a/TAO/CIAO/DAnCE/ciao/Servant_Activator.cpp +++ b/TAO/CIAO/DAnCE/ciao/Servant_Activator.cpp @@ -126,7 +126,7 @@ namespace CIAO PortableServer::Servant servant, CORBA::Boolean , CORBA::Boolean - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var str = diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp index 7db2c5526b6..ac7bba77599 100644 --- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp +++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp @@ -65,85 +65,76 @@ namespace CIAO ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)) { - // Removing Facets - Components::FacetDescriptions_var facets = - this->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - const CORBA::ULong facet_len = facets->length (); - CORBA::ULong i = 0; - for (i = 0; i < facet_len; ++i) + ACE_TRY { - PortableServer::ObjectId_var facet_id = - this->container_->the_facet_cons_POA ()->reference_to_id - (facets[i]->facet_ref () ACE_ENV_ARG_PARAMETER); - - ACE_TRY - { - this->container_->the_facet_cons_POA ()->deactivate_object - (facet_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Facet not active\n"); - } - ACE_ENDTRY; - - CIAO::Servant_Activator *sa = - this->container_->ports_servant_activator (); - sa->update_port_activator (facet_id ACE_ENV_ARG_PARAMETER); - } + // Removing Facets + Components::FacetDescriptions_var facets = + this->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + const CORBA::ULong facet_len = facets->length (); + CORBA::ULong i = 0; + for (i = 0; i < facet_len; ++i) + { + PortableServer::ObjectId_var facet_id = + this->container_->the_facet_cons_POA ()->reference_to_id + (facets[i]->facet_ref () ACE_ENV_ARG_PARAMETER); + + this->container_->the_facet_cons_POA ()->deactivate_object + (facet_id ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + CIAO::Servant_Activator *sa = + this->container_->ports_servant_activator (); + sa->update_port_activator (facet_id ACE_ENV_ARG_PARAMETER); + } - // Removed Facets + // Removed Facets - // Removing Consumers - Components::ConsumerDescriptions_var consumers = - this->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + // Removing Consumers + Components::ConsumerDescriptions_var consumers = + this->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; - const CORBA::ULong consumer_len = consumers->length (); - CORBA::ULong j = 0; - for (j = 0; j < consumer_len; ++j) - { - PortableServer::ObjectId_var cons_id = - this->container_->the_facet_cons_POA ()->reference_to_id - (consumers[j]->consumer () ACE_ENV_ARG_PARAMETER); - - ACE_TRY - { - this->container_->the_facet_cons_POA ()->deactivate_object - (cons_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Consumer not active\n"); - } - ACE_ENDTRY; - - CIAO::Servant_Activator *sa = - this->container_->ports_servant_activator (); - sa->update_port_activator (cons_id ACE_ENV_ARG_PARAMETER); - } + const CORBA::ULong consumer_len = consumers->length (); + CORBA::ULong j = 0; + for (j = 0; j < consumer_len; ++j) + { + PortableServer::ObjectId_var cons_id = + this->container_->the_facet_cons_POA ()->reference_to_id + (consumers[j]->consumer () ACE_ENV_ARG_PARAMETER); + + this->container_->the_facet_cons_POA ()->deactivate_object + (cons_id ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + CIAO::Servant_Activator *sa = + this->container_->ports_servant_activator (); + sa->update_port_activator (cons_id ACE_ENV_ARG_PARAMETER); + } - Components::SessionComponent_var temp = this->get_executor (); - temp->ccm_remove (ACE_ENV_SINGLE_ARG_PARAMETER); + Components::SessionComponent_var temp = this->get_executor (); + temp->ccm_remove (ACE_ENV_SINGLE_ARG_PARAMETER); - CORBA::Object_var objref = - this->container_->get_objref (this); + 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; + 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); - this->home_servant_->update_component_map (oid); + this->container_->uninstall_component ( ccmobjref.in (), + oid.out () + ACE_ENV_ARG_PARAMETER); + this->home_servant_->update_component_map (oid); + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Port not active\n"); + } + ACE_ENDTRY; } ::Components::ConnectionDescriptions * -- cgit v1.2.1