diff options
| author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-25 18:17:52 +0000 |
|---|---|---|
| committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-25 18:17:52 +0000 |
| commit | 2ee7b7eed4c0cc10f4ec25b186b04202af01b565 (patch) | |
| tree | 08a8a649c90559cf5b2228c1caad15515902613e /TAO/tests/ORB_destroy | |
| parent | c979767a00db4ea1299af482033a68829cc16675 (diff) | |
| download | ATCD-2ee7b7eed4c0cc10f4ec25b186b04202af01b565.tar.gz | |
ChangeLogTag: Thu Jan 25 17:39:59 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'TAO/tests/ORB_destroy')
| -rw-r--r-- | TAO/tests/ORB_destroy/ORB_destroy.cpp | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/TAO/tests/ORB_destroy/ORB_destroy.cpp b/TAO/tests/ORB_destroy/ORB_destroy.cpp index 0952defe3b5..61ad9caa6d5 100644 --- a/TAO/tests/ORB_destroy/ORB_destroy.cpp +++ b/TAO/tests/ORB_destroy/ORB_destroy.cpp @@ -30,19 +30,17 @@ test_with_regular_poa_manager (int argc, int destroy_orb, int destroy_poa) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, orb_name); CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -51,7 +49,7 @@ test_with_regular_poa_manager (int argc, if (destroy_poa) { - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } if (destroy_orb) @@ -59,12 +57,10 @@ test_with_regular_poa_manager (int argc, orb->destroy (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception raised"); + ex._tao_print_exception ("Exception raised"); } - ACE_ENDTRY; return 0; } @@ -77,19 +73,17 @@ test_with_funky_poa_manager (int argc, int destroy_poa, int funky_poa_manager) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, orb_name); CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); if (funky_poa_manager) { @@ -101,7 +95,7 @@ test_with_funky_poa_manager (int argc, if (destroy_poa) { - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } if (destroy_orb) @@ -109,12 +103,10 @@ test_with_funky_poa_manager (int argc, orb->destroy (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception raised"); + ex._tao_print_exception ("Exception raised"); } - ACE_ENDTRY; return 0; } |