diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 49a369925e7..3b78d4199ed 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -528,8 +528,7 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer ( CSIIOP::AssociationOptions csiv2_target_supports, CSIIOP::AssociationOptions csiv2_target_requires) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // @todo: This hard-coding should be fixed once SECIOP is // supported. @@ -542,13 +541,10 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; PortableInterceptor::ORBInitializer_var initializer = tmp; - PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableInterceptor::register_orb_initializer (initializer.in ()); // Register the SSLIOP ORB initializer. // PortableInterceptor::ORBInitializer_ptr tmp; @@ -561,24 +557,18 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; //PortableInterceptor::ORBInitializer_var initializer = tmp; initializer = tmp; - PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableInterceptor::register_orb_initializer (initializer.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unable to register SSLIOP ORB " - "initializer."); + ex._tao_print_exception ( + "Unable to register SSLIOP ORB initializer."); return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } |