diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 15:39:09 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 15:39:09 +0000 |
| commit | c801f87e59c00f72bdeb5ce7bd0d276674665bac (patch) | |
| tree | 70bff03d1cf156ecf05ee4c5c338d8ce423e64ee /TAO/tests/ORB_destroy | |
| parent | 98c0b37d4714ff774fc3ada8c9ee893c719af714 (diff) | |
| download | ATCD-c801f87e59c00f72bdeb5ce7bd0d276674665bac.tar.gz | |
Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tests/ORB_destroy')
| -rw-r--r-- | TAO/tests/ORB_destroy/ORB_destroy.cpp | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/TAO/tests/ORB_destroy/ORB_destroy.cpp b/TAO/tests/ORB_destroy/ORB_destroy.cpp index a1d4a89b03e..0952defe3b5 100644 --- a/TAO/tests/ORB_destroy/ORB_destroy.cpp +++ b/TAO/tests/ORB_destroy/ORB_destroy.cpp @@ -36,41 +36,33 @@ test_with_regular_poa_manager (int argc, { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (destroy_poa) { root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } if (destroy_orb) { - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception raised"); - ACE_CHECK_RETURN (-1); } ACE_ENDTRY; @@ -91,44 +83,36 @@ test_with_funky_poa_manager (int argc, { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (funky_poa_manager) { PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); } if (destroy_poa) { root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } if (destroy_orb) { - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception raised"); - ACE_CHECK_RETURN (-1); } ACE_ENDTRY; |