diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp index 72694d63538..be3f712ea3c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp @@ -16,17 +16,14 @@ ACE_RCSID(Event, EC_Event_Channel, "$Id$") TAO_EC_Event_Channel:: -TAO_EC_Event_Channel (const TAO_EC_Event_Channel_Attributes& attr, +TAO_EC_Event_Channel (PortableServer::POA_ptr supplier_poa, + PortableServer::POA_ptr consumer_poa, TAO_EC_Factory* factory, int own_factory) - : supplier_poa_ (PortableServer::POA::_duplicate (attr.supplier_poa)), - consumer_poa_ (PortableServer::POA::_duplicate (attr.consumer_poa)), + : supplier_poa_ (PortableServer::POA::_duplicate (supplier_poa)), + consumer_poa_ (PortableServer::POA::_duplicate (consumer_poa)), factory_ (factory), - own_factory_ (own_factory), - consumer_reconnect_ (attr.consumer_reconnect), - supplier_reconnect_ (attr.supplier_reconnect), - busy_hwm_ (attr.busy_hwm), - max_write_delay_ (attr.max_write_delay) + own_factory_ (own_factory) { if (this->factory_ == 0) { @@ -56,12 +53,6 @@ TAO_EC_Event_Channel (const TAO_EC_Event_Channel_Attributes& attr, this->factory_->create_timeout_generator (this); this->observer_strategy_ = this->factory_->create_observer_strategy (this); - - this->scheduler_ = - RtecScheduler::Scheduler::_duplicate (attr.scheduler); - - this->scheduling_strategy_ = - this->factory_->create_scheduling_strategy (this); } TAO_EC_Event_Channel::~TAO_EC_Event_Channel (void) @@ -115,10 +106,6 @@ TAO_EC_Event_Channel::shutdown (CORBA::Environment& ACE_TRY_ENV) ACE_CHECK; supplier_poa->deactivate_object (supplier_id.in (), ACE_TRY_ENV); ACE_CHECK; - - this->supplier_admin_->shutdown (ACE_TRY_ENV); - - this->consumer_admin_->shutdown (ACE_TRY_ENV); } void |