diff options
Diffstat (limited to 'TAO/tests/Portable_Interceptors/Redirection/client.cpp')
| -rw-r--r-- | TAO/tests/Portable_Interceptors/Redirection/client.cpp | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/TAO/tests/Portable_Interceptors/Redirection/client.cpp b/TAO/tests/Portable_Interceptors/Redirection/client.cpp index 8da1c03c45b..4dab792cc64 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/client.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/client.cpp @@ -48,8 +48,7 @@ main (int argc, char *argv[]) { int status = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { #if TAO_HAS_INTERCEPTORS == 1 PortableInterceptor::ORBInitializer_ptr temp_initializer = @@ -61,27 +60,21 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "Client ORB" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + "Client ORB"); if (::parse_args (argc, argv) != 0) return -1; CORBA::Object_var object = - orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->string_to_object (ior1); RedirectionTest::test_var server = - RedirectionTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + RedirectionTest::test::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -98,8 +91,7 @@ main (int argc, char *argv[]) "CLIENT: Issuing request %d.\n", i)); - number = server->number (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + number = server->number (); ACE_DEBUG ((LM_INFO, "CLIENT: Request %d handled by object %d.\n", @@ -107,16 +99,13 @@ main (int argc, char *argv[]) number)); } - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } - ACE_ENDTRY; if (status != -1) ACE_DEBUG ((LM_INFO, |