summaryrefslogtreecommitdiff
path: root/TAO/tao/PI/PI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/PI/PI.cpp')
-rw-r--r--TAO/tao/PI/PI.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp
index 61a039a52ed..87f37f55389 100644
--- a/TAO/tao/PI/PI.cpp
+++ b/TAO/tao/PI/PI.cpp
@@ -35,8 +35,7 @@ TAO_PI_Init::Initializer (void)
PortableInterceptor::ORBInitializer_var orb_initializer;
- ACE_DECLARE_NEW_CORBA_ENV;
- ACE_TRY
+ try
{
/// Register the PI ORBInitializer.
@@ -47,24 +46,20 @@ TAO_PI_Init::Initializer (void)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_TRY_CHECK;
orb_initializer = temp_orb_initializer;
PortableInterceptor::register_orb_initializer (orb_initializer.in ()
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ );
}
- ACE_CATCHANY
+ catch (const ::CORBA::Exception& ex)
{
if (TAO_debug_level > 0)
{
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- "(%P | %t) Caught exception:");
+ ex._tao_print_exception ("(%P | %t) Caught exception:");
}
return -1;
}
- ACE_ENDTRY;
#endif /* TAO_HAS_INTERCEPTORS == 1 */
return status;
}