diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp | 146 |
1 files changed, 73 insertions, 73 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp index 430e7bcd0ef..ff92e190c84 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp @@ -50,7 +50,7 @@ TAO_Notify_EventChannel_i::~TAO_Notify_EventChannel_i (void) } void -TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, const CosNotification::QoSProperties& initial_qos, const CosNotification::AdminProperties& initial_admin, PortableServer::POA_ptr default_POA, PortableServer::POA_ptr my_POA, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, const CosNotification::QoSProperties& initial_qos, const CosNotification::AdminProperties& initial_admin, PortableServer::POA_ptr default_POA, PortableServer::POA_ptr my_POA TAO_ENV_ARG_DECL) { this->channel_id_ = channel_id; @@ -58,38 +58,38 @@ TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, co this->default_POA_ = PortableServer::POA::_duplicate (default_POA); this->lock_ = - this->channel_objects_factory_->create_event_channel_lock (ACE_TRY_ENV); + this->channel_objects_factory_->create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->event_manager_ = - this->event_manager_objects_factory_->create_event_manager (this, ACE_TRY_ENV); + this->event_manager_objects_factory_->create_event_manager (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->event_manager_->init (ACE_TRY_ENV); + this->event_manager_->init (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // try to set initial qos params - this->set_qos (initial_qos, ACE_TRY_ENV); + this->set_qos (initial_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK; // try to set initial admin params - this->set_admin (initial_admin, ACE_TRY_ENV); + this->set_admin (initial_admin TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Create the POA for the CA's this->CA_POA_ = - this->poa_factory_->create_consumer_admin_POA (this->my_POA_.in (), channel_id, - ACE_TRY_ENV); + this->poa_factory_->create_consumer_admin_POA (this->my_POA_.in (), channel_id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Create the POA for the SA's this->SA_POA_ = - this->poa_factory_->create_supplier_admin_POA (this->my_POA_.in (), channel_id, - ACE_TRY_ENV); + this->poa_factory_->create_supplier_admin_POA (this->my_POA_.in (), channel_id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->event_listener_list_ = - TAO_Notify_Factory::get_collection_factory ()->create_event_listener_list (ACE_TRY_ENV); + TAO_Notify_Factory::get_collection_factory ()->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the default Consumer Admin. Because the ID_Pool is being used @@ -97,11 +97,11 @@ TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, co CosNotifyChannelAdmin::AdminID id_unused; CosNotifyChannelAdmin::ConsumerAdmin_var def_consumer_admin = - this->new_for_consumers (default_op_, id_unused, ACE_TRY_ENV); + this->new_for_consumers (default_op_, id_unused TAO_ENV_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::SupplierAdmin_var def_supplier_admin = - this->new_for_suppliers (default_op_, id_unused, ACE_TRY_ENV); + this->new_for_suppliers (default_op_, id_unused TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -130,10 +130,10 @@ TAO_Notify_EventChannel_i::get_default_POA (void) } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_EventChannel_i::get_ref (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Object_var obj = this->poa_factory_-> - servant_to_reference (this->my_POA_.in (), this, ACE_TRY_ENV); + servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in ()); @@ -141,76 +141,76 @@ TAO_Notify_EventChannel_i::get_ref (CORBA::Environment &ACE_TRY_ENV) void -TAO_Notify_EventChannel_i::unregister_listener (TAO_Notify_EventListener* group_listener, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::unregister_listener (TAO_Notify_EventListener* group_listener TAO_ENV_ARG_DECL) { // UnRegister the group listener. - this->event_listener_list_->disconnected (group_listener, ACE_TRY_ENV); + this->event_listener_list_->disconnected (group_listener TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_EventChannel_i::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->event_manager_->shutdown (ACE_TRY_ENV); + this->event_manager_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Deactivate ourselves. this->poa_factory_->deactivate_object (this, - this->my_POA_.in (), - ACE_TRY_ENV); + this->my_POA_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // shutdown consumer admins's. TAO_Notify_Shutdown_Worker shutdown_worker; - this->event_listener_list_->for_each (&shutdown_worker, ACE_TRY_ENV); + this->event_listener_list_->for_each (&shutdown_worker TAO_ENV_ARG_PARAMETER); ACE_CHECK; // release all references. - this->event_listener_list_->shutdown (ACE_TRY_ENV); + this->event_listener_list_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // @@ TODO: We need a way to send shutdown messages to the proxy consumers too. // (event listeners are proxy suppliers or CA's in disguise) - this->poa_factory_->destroy_POA (this->CA_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->destroy_POA (this->CA_POA_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->poa_factory_->destroy_POA (this->SA_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->destroy_POA (this->SA_POA_.in () + TAO_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_Notify_EventChannel_i::MyFactory (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::MyFactory (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->channel_factory_->get_ref (ACE_TRY_ENV); + return this->channel_factory_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel_i::default_consumer_admin (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::default_consumer_admin (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->get_consumeradmin (this->default_id_, ACE_TRY_ENV); + return this->get_consumeradmin (this->default_id_ TAO_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel_i::default_supplier_admin (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::default_supplier_admin (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->get_supplieradmin (this->default_id_, ACE_TRY_ENV); + return this->get_supplieradmin (this->default_id_ TAO_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterFactory_ptr -TAO_Notify_EventChannel_i::default_filter_factory (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_EventChannel_i::default_filter_factory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -219,14 +219,14 @@ TAO_Notify_EventChannel_i::default_filter_factory (CORBA::Environment &/*ACE_TRY } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // @@ use auto_ptr TAO_Notify_ConsumerAdmin_i* consumer_admin = - this->channel_objects_factory_->create_consumer_admin (this, ACE_TRY_ENV); + this->channel_objects_factory_->create_consumer_admin (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); PortableServer::ServantBase_var consumeradmin_var (consumer_admin); @@ -239,18 +239,18 @@ TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilter id = this->consumer_admin_ids_.get (); } - consumer_admin->init (id, op, this->CA_POA_.in (), ACE_TRY_ENV); + consumer_admin->init (id, op, this->CA_POA_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); CORBA::Object_var obj = this->poa_factory_->activate_object_with_id (id, this->CA_POA_.in (), - consumer_admin, - ACE_TRY_ENV); + consumer_admin + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); // Register the group listener. - this->event_listener_list_->connected (consumer_admin, ACE_TRY_ENV); + this->event_listener_list_->connected (consumer_admin TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); this->consumer_admin_ids_.next (); @@ -258,13 +258,13 @@ TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilter } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { TAO_Notify_SupplierAdmin_i* supplieradmin = - this->channel_objects_factory_->create_supplier_admin (this, ACE_TRY_ENV); + this->channel_objects_factory_->create_supplier_admin (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); PortableServer::ServantBase_var supplieradmin_var (supplieradmin); @@ -275,14 +275,14 @@ TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilter id = this->supplier_admin_ids_.get (); } - supplieradmin->init (id, op, this->SA_POA_.in (), ACE_TRY_ENV); + supplieradmin->init (id, op, this->SA_POA_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); CORBA::Object_var obj = this->poa_factory_-> activate_object_with_id (id, this->SA_POA_.in (), - supplieradmin, - ACE_TRY_ENV); + supplieradmin + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); this->supplier_admin_ids_.next (); @@ -290,46 +290,46 @@ TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilter } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminNotFound )) { CORBA::Object_var obj = - this->poa_factory_->id_to_reference (id, this->CA_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->id_to_reference (id, this->CA_POA_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); return CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in ()); } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminNotFound )) { CORBA::Object_var obj = - this->poa_factory_->id_to_reference (id, this->SA_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->id_to_reference (id, this->SA_POA_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); return CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in ()); } CosNotifyChannelAdmin::AdminIDSeq* -TAO_Notify_EventChannel_i::get_all_consumeradmins (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::get_all_consumeradmins (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->consumer_admin_ids_.get_sequence (ACE_TRY_ENV); + return this->consumer_admin_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::AdminIDSeq* -TAO_Notify_EventChannel_i::get_all_supplieradmins (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::get_all_supplieradmins (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -338,60 +338,60 @@ TAO_Notify_EventChannel_i::get_all_supplieradmins (CORBA::Environment &ACE_TRY_E CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); - return this->supplier_admin_ids_.get_sequence (ACE_TRY_ENV); + return this->supplier_admin_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER); } CosNotification::QoSProperties* -TAO_Notify_EventChannel_i::get_qos (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::get_qos (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->qos_admin_.get_qos (ACE_TRY_ENV); + return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_EventChannel_i::set_qos (const CosNotification::QoSProperties & qos,CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.set_qos (qos, ACE_TRY_ENV); + this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_EventChannel_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.validate_qos (required_qos, available_qos, ACE_TRY_ENV); + this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER); } CosNotification::AdminProperties* -TAO_Notify_EventChannel_i::get_admin (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::get_admin (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // Delegate to Event Manager. - return this->event_manager_->admin_properties ()->get_admin (ACE_TRY_ENV); + return this->event_manager_->admin_properties ()->get_admin (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_EventChannel_i::set_admin (const CosNotification::AdminProperties & admin, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::set_admin (const CosNotification::AdminProperties & admin TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedAdmin )) { - this->event_manager_->admin_properties ()->set_admin (admin, ACE_TRY_ENV); + this->event_manager_->admin_properties ()->set_admin (admin TAO_ENV_ARG_PARAMETER); } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel_i::for_consumers (CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_EventChannel_i::for_consumers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -401,25 +401,25 @@ TAO_Notify_EventChannel_i::for_consumers (CORBA::Environment& ACE_TRY_ENV) // TODO: find a way to disable the destroy method in the default Admin. CORBA::Object_var obj = - this->get_consumeradmin (this->default_id_, ACE_TRY_ENV); + this->get_consumeradmin (this->default_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosEventChannelAdmin::ConsumerAdmin::_nil ()); - return CosEventChannelAdmin::ConsumerAdmin::_narrow (obj.in (), - ACE_TRY_ENV); + return CosEventChannelAdmin::ConsumerAdmin::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } CosEventChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel_i::for_suppliers (CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_EventChannel_i::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { CORBA::Object_var obj = - this->get_supplieradmin (this->default_id_, ACE_TRY_ENV); + this->get_supplieradmin (this->default_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosEventChannelAdmin::SupplierAdmin::_nil ()); - return CosEventChannelAdmin::SupplierAdmin::_narrow (obj.in (), - ACE_TRY_ENV); + return CosEventChannelAdmin::SupplierAdmin::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) |