summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp')
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp82
1 files changed, 41 insertions, 41 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp
index 2fd49c7ce7b..6b0651d1f63 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp
@@ -25,9 +25,9 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::TAO_Notify_ProxySupplier (TAO_Notify_Con
}
template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
{
- consumer_admin_->_add_ref (ACE_TRY_ENV);
+ consumer_admin_->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
this->proxy_id_ = proxy_id;
@@ -35,7 +35,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID pro
TAO_Notify_CO_Factory* cof =
TAO_Notify_Factory::get_channel_objects_factory ();
- this->lock_ = cof->create_proxy_supplier_lock (ACE_TRY_ENV);
+ this->lock_ = cof->create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
TAO_Notify_EMO_Factory* event_manager_objects_factory =
@@ -43,11 +43,11 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID pro
// Create the task to forward filtering/dispatching commands to:
this->dispatching_task_ =
- event_manager_objects_factory->create_dispatching_task (ACE_TRY_ENV);
+ event_manager_objects_factory->create_dispatching_task (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
this->filter_eval_task_ =
- event_manager_objects_factory->create_listener_eval_task (ACE_TRY_ENV);
+ event_manager_objects_factory->create_listener_eval_task (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
// Get hold of the admin properties.
@@ -64,8 +64,8 @@ template <class SERVANT_TYPE>
TAO_Notify_ProxySupplier<SERVANT_TYPE>::~TAO_Notify_ProxySupplier (void)
{
ACE_DECLARE_NEW_CORBA_ENV;
- this->event_manager_->unregister_from_publication_updates (this,
- ACE_TRY_ENV);
+ this->event_manager_->unregister_from_publication_updates (this
+ TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
// unsubscribe it to our current subscriptions.
@@ -76,13 +76,13 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::~TAO_Notify_ProxySupplier (void)
added.length (0);
this->event_manager_->subscribe_for_events (this,
- added, removed, ACE_TRY_ENV);
+ added, removed TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
delete this->lock_;
this->consumer_admin_->proxy_pushsupplier_destroyed (this->proxy_id_);
- consumer_admin_->_remove_ref (ACE_TRY_ENV);
+ consumer_admin_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
TAO_Notify_EMO_Factory* event_manager_objects_factory =
@@ -93,23 +93,23 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::~TAO_Notify_ProxySupplier (void)
}
template <class SERVANT_TYPE> CORBA::Boolean
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL)
{
if (eval_parent == 1)
{
CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator =
- consumer_admin_->MyOperator (ACE_TRY_ENV);
+ consumer_admin_->MyOperator (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
// Inter-filter group operator.
CORBA::Boolean bval =
- this->consumer_admin_->get_filter_admin ().match (event, ACE_TRY_ENV);
+ this->consumer_admin_->get_filter_admin ().match (event TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
if ((bval == 1 && filter_operator == CosNotifyChannelAdmin::AND_OP) ||
(bval == 0 && filter_operator == CosNotifyChannelAdmin::OR_OP))
{
- bval = this->filter_admin_.match (event, ACE_TRY_ENV);
+ bval = this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
return bval;
}
@@ -119,11 +119,11 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event
return 0;
}
else
- return this->filter_admin_.match (event, ACE_TRY_ENV);
+ return this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER);
}
template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::dispatch_event (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL)
{
if (this->is_connected_ == 0)
{
@@ -141,7 +141,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::dispatch_event (TAO_Notify_Event &event,
this->event_list_.enqueue_tail (event.clone ());
}
else
- this->dispatch_event_i (event, ACE_TRY_ENV);
+ this->dispatch_event_i (event TAO_ENV_ARG_PARAMETER);
}
template <class SERVANT_TYPE> TAO_Notify_Worker_Task*
@@ -157,7 +157,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::filter_eval_task (void)
}
template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((
CORBA::SystemException,
CosNotifyComm::InvalidEventType
@@ -166,7 +166,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotificati
if (this->is_connected_ == 1)
{
this->event_manager_->subscribe_for_events (this,
- added, removed, ACE_TRY_ENV);
+ added, removed TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
}
@@ -182,7 +182,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotificati
}
template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (TAO_ENV_SINGLE_ARG_DECL)
{
// Get hold of the admin properties.
TAO_Notify_AdminProperties* const admin_properties =
@@ -196,7 +196,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (CORBA::Environment &ACE_TR
ACE_THROW (CORBA::IMP_LIMIT ()); // we've reached the limit of consumers connected.
// register with CA
- this->consumer_admin_->register_listener (this, ACE_TRY_ENV);
+ this->consumer_admin_->register_listener (this TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
CosNotification::EventTypeSeq added;
@@ -210,17 +210,17 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (CORBA::Environment &ACE_TR
this->subscription_list_.populate (added);
this->event_manager_->subscribe_for_events (this,
- added, removed, ACE_TRY_ENV);
+ added, removed TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
- this->event_manager_->register_for_publication_updates (this, ACE_TRY_ENV);
+ this->event_manager_->register_for_publication_updates (this TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
(*consumer_count)++;
}
template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (TAO_ENV_SINGLE_ARG_DECL)
{
{
ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
@@ -244,18 +244,18 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (CORBA::Environment &ACE
this->subscription_list_.populate (removed);
this->event_manager_->subscribe_for_events (this,
- added, removed, ACE_TRY_ENV);
+ added, removed TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
- this->event_manager_->unregister_from_publication_updates (this, ACE_TRY_ENV);
+ this->event_manager_->unregister_from_publication_updates (this TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
// shutdown the tasks.
- this->dispatching_task_->shutdown (ACE_TRY_ENV);
+ this->dispatching_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
- this->filter_eval_task_->shutdown (ACE_TRY_ENV);
+ this->filter_eval_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
// Get hold of the admin properties.
@@ -266,7 +266,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (CORBA::Environment &ACE
}
template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::suspend_connection (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
ACE_THROW_SPEC ((
CORBA::SystemException,
CosNotifyChannelAdmin::ConnectionAlreadyInactive,
@@ -277,7 +277,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::suspend_connection (CORBA::Environment &
}
template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((
CORBA::SystemException,
CosNotifyChannelAdmin::ConnectionAlreadyActive,
@@ -295,7 +295,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (CORBA::Environment &A
while (this->event_list_.dequeue_head (event) == 0)
{
- this->dispatch_event_i (*event, ACE_TRY_ENV);
+ this->dispatch_event_i (*event TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
delete event;
@@ -304,16 +304,16 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (CORBA::Environment &A
}
template <class SERVANT_TYPE> CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::MyAdmin (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::MyAdmin (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->consumer_admin_->get_ref (ACE_TRY_ENV);
+ return this->consumer_admin_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
}
template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -323,7 +323,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CORBA::Environment &ACE
}
template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -332,7 +332,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CosNotifyFilter::Mappin
}
template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -342,7 +342,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CORBA::Environment &ACE
}
template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -351,7 +351,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::Mappin
}
template <class SERVANT_TYPE> CosNotification::EventTypeSeq*
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -369,15 +369,15 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAd
{
// if updates are currently off, switch them on.
if (this->updates_on_ == 0)
- this->event_manager_->register_for_publication_updates (this,
- ACE_TRY_ENV);
+ this->event_manager_->register_for_publication_updates (this
+ TAO_ENV_ARG_PARAMETER);
}
else
{
// if updates are currently on, switch them off.
if (this->updates_on_ == 1)
- this->event_manager_->unregister_from_publication_updates (this,
- ACE_TRY_ENV);
+ this->event_manager_->unregister_from_publication_updates (this
+ TAO_ENV_ARG_PARAMETER);
}
return event_type_seq;
}
View Lorry Controller Status