diff options
Diffstat (limited to 'TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp')
| -rw-r--r-- | TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp | 64 |
1 files changed, 25 insertions, 39 deletions
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp index 4b9bc703257..e09b1b72eaf 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp @@ -22,32 +22,29 @@ TAO_IORInterceptor_Adapter_Impl::~TAO_IORInterceptor_Adapter_Impl (void) void TAO_IORInterceptor_Adapter_Impl::add_interceptor ( PortableInterceptor::IORInterceptor_ptr i - ACE_ENV_ARG_DECL + ) { this->ior_interceptor_list_.add_interceptor (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void TAO_IORInterceptor_Adapter_Impl::add_interceptor ( PortableInterceptor::IORInterceptor_ptr i, const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL + ) { this->ior_interceptor_list_.add_interceptor (i, policies - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } void -TAO_IORInterceptor_Adapter_Impl::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) +TAO_IORInterceptor_Adapter_Impl::destroy_interceptors (void) { - this->ior_interceptor_list_.destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->ior_interceptor_list_.destroy_interceptors (); delete this; } @@ -55,7 +52,7 @@ TAO_IORInterceptor_Adapter_Impl::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) void TAO_IORInterceptor_Adapter_Impl::establish_components ( TAO_Root_POA* poa - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { const size_t interceptor_count = this->ior_interceptor_list_.size (); @@ -71,7 +68,6 @@ TAO_IORInterceptor_Adapter_Impl::establish_components ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::IORInfo_var info = tao_info; @@ -82,14 +78,13 @@ TAO_IORInterceptor_Adapter_Impl::establish_components ( for (size_t i = 0; i < interceptor_count; ++i) { - ACE_TRY + try { this->ior_interceptor_list_.interceptor (i)->establish_components ( info.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } - ACE_CATCHANY + catch (const ::CORBA::Exception& ex) { // According to the Portable Interceptors specification, // IORInterceptor::establish_components() must not throw an @@ -100,8 +95,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components ( { CORBA::String_var name = this->ior_interceptor_list_.interceptor (i)->name ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ); // @@ What do we do if we get an exception here? if (name.in () != 0) @@ -112,20 +106,17 @@ TAO_IORInterceptor_Adapter_Impl::establish_components ( ACE_TEXT_CHAR_TO_TCHAR (name.in ()))); } - ACE_PRINT_TAO_EXCEPTION (ACE_ANY_EXCEPTION, - "Ignoring exception in " - "IORInterceptor::establish_components"); + ex._tao_print_exception ( + "Ignoring exception in " + "IORInterceptor::establish_components"); } } - ACE_ENDTRY; - ACE_CHECK; } tao_info->components_established (); this->components_established (info.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); // The IORInfo instance is no longer valid. Invalidate it to // prevent the user from peforming "illegal" operations. @@ -135,7 +126,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components ( void TAO_IORInterceptor_Adapter_Impl::components_established ( PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Iterate over the registered IOR interceptors so that they may be @@ -148,7 +139,7 @@ TAO_IORInterceptor_Adapter_Impl::components_established ( // on all the IORInterceptors. for (size_t j = 0; j < interceptor_count; ++j) { - ACE_TRY + try { PortableInterceptor::IORInterceptor_ptr ior_interceptor = this->ior_interceptor_list_.interceptor (j); @@ -159,17 +150,14 @@ TAO_IORInterceptor_Adapter_Impl::components_established ( { ior_3_interceptor->components_established ( info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } } - ACE_CATCHANY + catch (const ::CORBA::Exception&) { - ACE_THROW (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 6, - CORBA::COMPLETED_NO)); + throw ::CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 6, + CORBA::COMPLETED_NO); } - ACE_ENDTRY; - ACE_CHECK; } } @@ -177,7 +165,7 @@ void TAO_IORInterceptor_Adapter_Impl::adapter_state_changed ( const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template, PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { const size_t interceptor_count = this->ior_interceptor_list_.size (); @@ -212,8 +200,7 @@ TAO_IORInterceptor_Adapter_Impl::adapter_state_changed ( ior_3_interceptor->adapter_state_changed ( seq_obj_ref_template, state - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } } @@ -222,7 +209,7 @@ void TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed ( const char * id, PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { /// Whenever the POAManager state is changed, the @@ -245,8 +232,7 @@ TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed ( ior_3_interceptor->adapter_manager_state_changed ( id, state - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); } } } |