diff options
Diffstat (limited to 'TAO/tao/IORInterceptor/IORInfo.cpp')
| -rw-r--r-- | TAO/tao/IORInterceptor/IORInfo.cpp | 73 |
1 files changed, 29 insertions, 44 deletions
diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp index de6dd91494d..56e74eb0662 100644 --- a/TAO/tao/IORInterceptor/IORInfo.cpp +++ b/TAO/tao/IORInterceptor/IORInfo.cpp @@ -28,15 +28,13 @@ TAO_IORInfo::~TAO_IORInfo (void) CORBA::Policy_ptr TAO_IORInfo::get_effective_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + this->check_validity (); CORBA::Policy_var policy = - this->poa_->get_policy (type ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + this->poa_->get_policy (type); if (!CORBA::is_nil (policy.in ())) { @@ -54,70 +52,62 @@ TAO_IORInfo::get_effective_policy (CORBA::PolicyType type void TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_validity (); if (this->components_established_) - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, + throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO)); // Add the given tagged component to all profiles. this->poa_->save_ior_component (component - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void TAO_IORInfo::add_ior_component_to_profile ( const IOP::TaggedComponent &component, IOP::ProfileId profile_id - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_validity (); if (this->components_established_) - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, + throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO)); this->poa_->save_ior_component_and_profile_id (component, profile_id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } char * -TAO_IORInfo::manager_id (ACE_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::manager_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); - PortableServer::POAManager_var poa_manager = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - return poa_manager->get_id (ACE_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POAManager_var poa_manager = this->poa_->the_POAManager (); + return poa_manager->get_id (); } PortableInterceptor::AdapterState -TAO_IORInfo::state (ACE_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::state (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableInterceptor::NON_EXISTENT); + this->check_validity (); - return this->poa_->get_adapter_state (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->poa_->get_adapter_state (); } PortableInterceptor::ObjectReferenceTemplate * -TAO_IORInfo::adapter_template (ACE_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::adapter_template (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); // Return the Object Reference Template whenever an IOR Interceptor // is invoked. Its value is the template created for the adapter @@ -125,8 +115,7 @@ TAO_IORInfo::adapter_template (ACE_ENV_SINGLE_ARG_DECL) // add_ior_component_to_profile. It's a const value and its value // never changes. PortableInterceptor::ObjectReferenceTemplate *adapter_template = - this->poa_->get_adapter_template (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->poa_->get_adapter_template (); if (adapter_template == 0) { @@ -139,11 +128,10 @@ TAO_IORInfo::adapter_template (ACE_ENV_SINGLE_ARG_DECL) } PortableInterceptor::ObjectReferenceFactory * -TAO_IORInfo::current_factory (ACE_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::current_factory (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->check_validity (); // Return the current_factory that is used to create the object // references by the adapter. Though initially, its value is the @@ -151,8 +139,7 @@ TAO_IORInfo::current_factory (ACE_ENV_SINGLE_ARG_DECL) // can be changed. The value of the current_factory can be changed // only during the call to components_established method. PortableInterceptor::ObjectReferenceFactory *adapter_factory = - this->poa_->get_obj_ref_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->poa_->get_obj_ref_factory (); if (adapter_factory == 0) { @@ -167,19 +154,17 @@ TAO_IORInfo::current_factory (ACE_ENV_SINGLE_ARG_DECL) void TAO_IORInfo::current_factory ( PortableInterceptor::ObjectReferenceFactory * current_factory - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->check_validity (); this->poa_->set_obj_ref_factory (current_factory - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void -TAO_IORInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::check_validity (void) { if (this->poa_ == 0) { @@ -189,7 +174,7 @@ TAO_IORInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL) // once the POA has invoked all IORInterceptor interception // points. This also prevents memory access violations from // occuring if the POA is destroyed before this IORInfo object. - ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO::VMCID, + throw ( ::CORBA::OBJECT_NOT_EXIST (TAO::VMCID, CORBA::COMPLETED_NO)); } } |