diff options
Diffstat (limited to 'TAO/tao/Messaging/Messaging_ORBInitializer.cpp')
| -rw-r--r-- | TAO/tao/Messaging/Messaging_ORBInitializer.cpp | 51 |
1 files changed, 16 insertions, 35 deletions
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp index 82a57e50c9e..d2bc635f550 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp @@ -17,9 +17,7 @@ ACE_RCSID (Messaging, TAO_BEGIN_VERSIONED_NAMESPACE_DECL void -TAO_Messaging_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Messaging_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) @@ -40,30 +38,22 @@ TAO_Messaging_ORBInitializer::pre_init ( void TAO_Messaging_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) + PortableInterceptor::ORBInitInfo_ptr info) + ACE_THROW_SPEC ((CORBA::SystemException)) { - this->register_policy_factories (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->register_policy_factories (info); - this->register_value_factory (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->register_value_factory (info); } void TAO_Messaging_ORBInitializer::register_value_factory ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) { // Narrow to a TAO_ORBInitInfo object to get access to the // orb_core() TAO extension. TAO_ORBInitInfo_var tao_info = - TAO_ORBInitInfo::_narrow (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + TAO_ORBInitInfo::_narrow (info); if (CORBA::is_nil (tao_info.in ())) { @@ -74,7 +64,7 @@ TAO_Messaging_ORBInitializer::register_value_factory ( "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" "(%P|%t) \"TAO_ORBInitInfo *.\"\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw ::CORBA::INTERNAL (); } TAO::ExceptionHolderFactory *base_factory = 0; @@ -84,14 +74,11 @@ TAO_Messaging_ORBInitializer::register_value_factory ( tao_info->orb_core()->orb ()->register_value_factory ( Messaging::ExceptionHolder::_tao_obv_static_repository_id (), - base_factory - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + base_factory); } void TAO_Messaging_ORBInitializer::register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) { // Register the Messaging policy factories. @@ -103,7 +90,6 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::PolicyFactory_var policy_factory = @@ -160,14 +146,11 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( const CORBA::PolicyType *end = type + sizeof (type) / sizeof (type[0]); for (CORBA::PolicyType *i = type; i != end; ++i) { - ACE_TRY + try { - info->register_policy_factory (*i, - policy_factory.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + info->register_policy_factory (*i, policy_factory.in ()); } - ACE_CATCH (CORBA::BAD_INV_ORDER, ex) + catch (const ::CORBA::BAD_INV_ORDER& ex) { if (ex.minor () == (CORBA::OMGVMCID | 16)) { @@ -177,15 +160,13 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( // should do no more work in this ORBInitializer. return; } - ACE_RE_THROW; + throw; } - ACE_CATCHANY + catch (const ::CORBA::Exception&) { // Rethrow any other exceptions... - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK; } } |