diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Event/Basic/Negation.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Event/Basic/Negation.cpp | 100 |
1 files changed, 31 insertions, 69 deletions
diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp index 37ab5c1fb30..5e2a7583dd0 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp @@ -17,25 +17,19 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa->the_POAManager (); + poa_manager->activate (); // **************************************************************** @@ -45,25 +39,21 @@ main (int argc, char* argv[]) attributes.supplier_reconnect = 1; TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec_impl.activate (); RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec_impl._this (); // **************************************************************** // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + event_channel->for_consumers (); // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + event_channel->for_suppliers (); // **************************************************************** @@ -74,44 +64,32 @@ main (int argc, char* argv[]) EC_Counting_Supplier first_supplier; first_supplier.activate (consumer_admin.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + milliseconds); first_supplier.connect (supplier_admin.in (), event_source, event_type, event_source, - event_type - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + event_type); EC_Counting_Supplier second_supplier; second_supplier.activate (consumer_admin.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + milliseconds); second_supplier.connect (supplier_admin.in (), event_source, event_type + 1, event_source, - event_type + 1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + event_type + 1); EC_Counting_Supplier third_supplier; third_supplier.activate (consumer_admin.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + milliseconds); third_supplier.connect (supplier_admin.in (), event_source, event_type + 1, event_source, - event_type + 1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + event_type + 1); // **************************************************************** @@ -126,9 +104,7 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type, 0); regular_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -144,9 +120,7 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type, 0); negation_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -158,38 +132,28 @@ main (int argc, char* argv[]) // **************************************************************** - negation_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + negation_consumer.disconnect (); // **************************************************************** - regular_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + regular_consumer.disconnect (); // **************************************************************** - third_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - third_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - second_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - second_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - first_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - first_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + third_supplier.deactivate (); + third_supplier.disconnect (); + second_supplier.deactivate (); + second_supplier.disconnect (); + first_supplier.deactivate (); + first_supplier.disconnect (); // **************************************************************** - event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + event_channel->destroy (); // **************************************************************** - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + poa->destroy (1, 1); // **************************************************************** @@ -201,14 +165,12 @@ main (int argc, char* argv[]) first_supplier.event_count; regular_consumer.dump_results (expected, 5); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service"); + ex._tao_print_exception ("Service"); return 1; } - ACE_ENDTRY; return 0; } |