diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp index 139e85e262c..0fff26d0bbd 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp @@ -16,9 +16,9 @@ TAO_Iterator_i::TAO_Iterator_i (PortableServer::POA_ptr poa, : poa_ (PortableServer::POA::_duplicate (poa)), reactor_ (reactor) { - if (this->timeout_ != ACE_Time_Value::zero) + if (this->timeout_ != ACE_Time_Value::zero) { - this->timer_id_ = + this->timer_id_ = this->reactor_->schedule_timer (this, 0, this->timeout_); } } @@ -29,24 +29,21 @@ TAO_Iterator_i::~TAO_Iterator_i (void) // cancel timer if (this->timer_id_ != -1) { - this->reactor_->cancel_timer (this->timer_id_); + this->reactor_->cancel_timer (this->timer_id_); } } void -TAO_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_Iterator_i::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = - this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->poa_->servant_to_id (this); // Goodbye cruel world... // deactivate from the poa. - this->poa_->deactivate_object (oid.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->poa_->deactivate_object (oid.in ()); return; } @@ -54,15 +51,13 @@ TAO_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL) int TAO_Iterator_i::handle_timeout(const ACE_Time_Value&, const void*) { - ACE_TRY_NEW_ENV + try { - this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception&) { } - ACE_ENDTRY; return 0; } |