diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index 6c6853cf891..bc0a85a9974 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -23,7 +23,7 @@ TAO_EventLog_i::TAO_EventLog_i (CORBA::ORB_ptr orb, ACE_DECLARE_NEW_CORBA_ENV; // Create an instance of the event channel. - TAO_CEC_EventChannel_Attributes attr (this->poa_.in(), + TAO_CEC_EventChannel_Attributes attr (this->poa_.in(), this->poa_.in()); ACE_NEW_THROW_EX (this->event_channel_, @@ -47,15 +47,12 @@ ACE_THROW_SPEC ((CORBA::SystemException)) DsEventLogAdmin::EventLogFactory_var eventLogFactory = DsEventLogAdmin::EventLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); DsEventLogAdmin::EventLog_var log = eventLogFactory->create (DsLogAdmin::halt, 0, thresholds_, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); return log._retn (); @@ -69,15 +66,12 @@ ACE_THROW_SPEC ((CORBA::SystemException)) DsEventLogAdmin::EventLogFactory_var eventLogFactory = DsEventLogAdmin::EventLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); DsEventLogAdmin::EventLog_var log = eventLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); return log._retn (); @@ -85,55 +79,49 @@ ACE_THROW_SPEC ((CORBA::SystemException)) void -TAO_EventLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_EventLog_i::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Send event to indicate the log has been deleted. notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Remove ourselves from the list of logs. this->logmgr_i_.remove (this->logid_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Deregister with POA. PortableServer::ObjectId_var id = this->log_poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->log_poa_->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_EventLog_i::activate (ACE_ENV_SINGLE_ARG_DECL) +TAO_EventLog_i::activate (void) { CosEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->event_channel_->for_consumers (); // Create the PushConsumer that will log the events. this->my_log_consumer_ = new TAO_Event_LogConsumer (this); - ACE_CHECK; this->my_log_consumer_->connect (consumer_admin.in ()); } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_EventLog_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL) +TAO_EventLog_i::for_consumers (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->event_channel_->for_consumers (); } CosEventChannelAdmin::SupplierAdmin_ptr -TAO_EventLog_i::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) +TAO_EventLog_i::for_suppliers (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->event_channel_->for_suppliers (); } TAO_END_VERSIONED_NAMESPACE_DECL |