diff options
Diffstat (limited to 'TAO/tests/Faults/pong.cpp')
-rw-r--r-- | TAO/tests/Faults/pong.cpp | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp index fbc0b86a42f..f530bfb57c2 100644 --- a/TAO/tests/Faults/pong.cpp +++ b/TAO/tests/Faults/pong.cpp @@ -70,11 +70,9 @@ run_client (CORBA::ORB_ptr orb, { reason = "Exception during ping call"; server->ping (callback ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Run for <period> milliseconds, to receive the reply orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Terminate the client if: // - This is the last iteration @@ -84,8 +82,7 @@ run_client (CORBA::ORB_ptr orb, { ACE_DEBUG ((LM_DEBUG, "Shutting down server\n")); reason = "Exception during server shutdown"; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } } ACE_CATCH (CORBA::TRANSIENT, t) @@ -117,60 +114,46 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.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 (); // create child poa with PERSISTENT policy - ACE_TRY_CHECK; CORBA::PolicyList policies; policies.length (2); policies[0] = root_poa->create_lifespan_policy(PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policies[1] = root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var persistent_poa = root_poa->create_POA("persistent", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); + policies[1]->destroy (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PingObject_var server = PingObject::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -184,8 +167,7 @@ main (int argc, char *argv[]) persistent_poa.in ()); PingObject_var callback = - callback_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + callback_impl._this (); // If the ior_output_file exists, output the ior to it @@ -193,13 +175,10 @@ main (int argc, char *argv[]) server.in (), callback.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { |