diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp index e6e08c409d5..81026aa8fd3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp @@ -48,7 +48,6 @@ TAO_EC_Reactive_SupplierControl::query_suppliers ( TAO_EC_Ping_Supplier worker (this); this->event_channel_->for_each_supplier (&worker ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -64,26 +63,21 @@ TAO_EC_Reactive_SupplierControl::handle_timeout ( CORBA::PolicyList_var policies = this->policy_current_->get_policy_overrides (types ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Query the state of the suppliers... - this->query_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->query_suppliers (); this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } } ACE_CATCHANY @@ -103,12 +97,10 @@ TAO_EC_Reactive_SupplierControl::activate (void) CORBA::Object_var tmp = this->orb_->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->policy_current_ = CORBA::PolicyCurrent::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Timeout for polling state (default = 10 msec) TimeBase::TimeT timeout = timeout_.usec() * 10; @@ -121,7 +113,6 @@ TAO_EC_Reactive_SupplierControl::activate (void) Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Only schedule the timer, when the rate is not zero if (this->rate_ != ACE_Time_Value::zero) @@ -169,8 +160,7 @@ TAO_EC_Reactive_SupplierControl::supplier_not_exist ( //ACE_DEBUG ((LM_DEBUG, // "EC_Reactive_SupplierControl(%P|%t) - " // "Consumer %x does not exists\n", long(proxy))); - proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + proxy->disconnect_push_consumer (); } ACE_CATCHANY { @@ -197,8 +187,7 @@ TAO_EC_Reactive_SupplierControl::system_exception ( // return; // Anything else is serious, including timeouts... - proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + proxy->disconnect_push_consumer (); } ACE_CATCHANY { @@ -236,17 +225,14 @@ TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer CORBA::Boolean non_existent = consumer->supplier_non_existent (disconnected ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (non_existent && !disconnected) { this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) { @@ -254,7 +240,6 @@ TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer // want to be more lenient in the future.. // if (transient.minor () == 0x54410085) this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { |