diff options
Diffstat (limited to 'TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp')
-rw-r--r-- | TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp | 56 |
1 files changed, 19 insertions, 37 deletions
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp index 05b214aabbc..e170689137b 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp @@ -35,8 +35,7 @@ Consumer::Consumer (void) int Consumer::run (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // First parse our command line options if (this->parse_args(argc, argv) != 0) @@ -46,29 +45,23 @@ Consumer::run (int argc, char* argv[]) // 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, ""); // Do *NOT* make a copy because we don't want the ORB to outlive // the run() method. this->orb_ = orb.in (); 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 (); // Obtain the event channel from the naming service CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->resolve_initial_references ("NameService"); if (CORBA::is_nil (naming_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -76,21 +69,17 @@ Consumer::run (int argc, char* argv[]) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CosNaming::NamingContext::_narrow (naming_obj.in ()); CosNaming::Name name (1); name.length (1); name[0].id = CORBA::string_dup (ecname); CORBA::Object_var ec_obj = - naming_context->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + naming_context->resolve (name); RtecEventChannelAdmin::EventChannel_var event_channel = - RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()); if (CORBA::is_nil (event_channel.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -99,16 +88,13 @@ Consumer::run (int argc, char* argv[]) // The canonical protocol to connect to the EC RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + event_channel->for_consumers (); RtecEventChannelAdmin::ProxyPushSupplier_var supplier = - consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer_admin->obtain_push_supplier (); RtecEventComm::PushConsumer_var consumer = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_this (); ACE_ConsumerQOS_Factory qos; qos.start_disjunction_group (); @@ -121,9 +107,7 @@ Consumer::run (int argc, char* argv[]) MY_EVENT_TYPE + i, // Event Type 0); // handle to the rt_info } - supplier->connect_push_consumer (consumer.in (), qos - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + supplier->connect_push_consumer (consumer.in (), qos); // Wait for events, using work_pending()/perform_work() may help // or using another thread, this example is too simple for that. @@ -136,18 +120,16 @@ Consumer::run (int argc, char* argv[]) // work_pending()/perform_work() to do more interesting stuff. // Check the supplier for the proper way to do cleanup. } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer::run"); + ex._tao_print_exception ("Consumer::run"); return 1; } - ACE_ENDTRY; return 0; } void -Consumer::push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL_NOT_USED) +Consumer::push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) @@ -167,13 +149,13 @@ Consumer::push (const RtecEventComm::EventSet& events } void -Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) +Consumer::disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have // to be the case.... - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } int |