diff options
Diffstat (limited to 'TAO/tests/AMI/simple_client.cpp')
-rw-r--r-- | TAO/tests/AMI/simple_client.cpp | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp index 2a22d5164ed..fc9c9b722df 100644 --- a/TAO/tests/AMI/simple_client.cpp +++ b/TAO/tests/AMI/simple_client.cpp @@ -97,8 +97,7 @@ public: "Testing proper exception handling ...\n")); ACE_TRY { - excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + excep_holder->raise_exception (); } ACE_CATCH (A::DidTheRightThing, ex) { @@ -112,7 +111,6 @@ public: "... caught the wrong exception -> ERROR\n")); } ACE_ENDTRY; - ACE_CHECK; }; @@ -133,7 +131,7 @@ public: "Callback method <get_yadda_excep> called: \n")); }; - void set_yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void set_yadda (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -175,33 +173,26 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object_var = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var poa_var = PortableServer::POA::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager_var = - poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_var->the_POAManager (); - poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager_var->activate (); if (parse_args (argc, argv) != 0) return 1; // We reuse the object_var smart pointer! object_var = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; A::AMI_Test_var ami_test_var = A::AMI_Test::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (ami_test_var.in ())) { @@ -214,8 +205,7 @@ main (int argc, char *argv[]) // Instantiate the ReplyHandler and register that with the POA. Handler handler; A::AMI_AMI_TestHandler_var the_handler_var = - handler._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + handler._this (); // Try out sending asynchronous messages without a reply handler // registered. Things fail if we get an exception. @@ -224,7 +214,6 @@ main (int argc, char *argv[]) 0, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Trigger the DidTheRightThing exception on the server side // by sending 0 to it. @@ -235,7 +224,6 @@ main (int argc, char *argv[]) 0, "Let's talk AMI." ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Long l = 931247; @@ -249,22 +237,18 @@ main (int argc, char *argv[]) l, "Let's talk AMI." ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } // Begin test of attributes ami_test_var->sendc_get_yadda (the_handler_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ami_test_var->sendc_set_yadda (the_handler_var.in (), 4711 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ami_test_var->sendc_get_yadda (the_handler_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // End test of attributes @@ -289,7 +273,6 @@ main (int argc, char *argv[]) l, "Let's talk SMI." ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (debug) { @@ -300,17 +283,14 @@ main (int argc, char *argv[]) if (shutdown_flag) { - ami_test_var->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ami_test_var->shutdown (); } poa_var->destroy (1, // ethernalize objects 0 // wait for completion ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -319,7 +299,6 @@ main (int argc, char *argv[]) return 1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } |