1 files changed, 4 insertions, 84 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i
index 003de1ebbef..549a3af4840 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i
@@ -1,19 +1,5 @@
 // $Id$
 
-ACE_INLINE
-TAO_EC_Event_Channel_Attributes::
-TAO_EC_Event_Channel_Attributes (PortableServer::POA_ptr s_poa,
-                                 PortableServer::POA_ptr c_poa)
-  :  consumer_reconnect (0),
-     supplier_reconnect (0),
-     busy_hwm (1),
-     max_write_delay (1),
-     scheduler (RtecScheduler::Scheduler::_nil ()),
-     supplier_poa (s_poa),
-     consumer_poa (c_poa)
-{
-}
-
 ACE_INLINE TAO_EC_Dispatching*
 TAO_EC_Event_Channel::dispatching (void) const
 {
@@ -26,12 +12,6 @@ TAO_EC_Event_Channel::filter_builder (void) const
   return this->filter_builder_;
 }
 
-ACE_INLINE TAO_EC_Supplier_Filter_Builder*
-TAO_EC_Event_Channel::supplier_filter_builder (void) const
-{
-  return this->supplier_filter_builder_;
-}
-
 ACE_INLINE TAO_EC_ConsumerAdmin*
 TAO_EC_Event_Channel::consumer_admin (void) const
 {
@@ -50,12 +30,6 @@ TAO_EC_Event_Channel::timeout_generator (void) const
   return this->timeout_generator_;
 }
 
-ACE_INLINE TAO_EC_Scheduling_Strategy*
-TAO_EC_Event_Channel::scheduling_strategy (void) const
-{
-  return this->scheduling_strategy_;
-}
-
 ACE_INLINE TAO_EC_ProxyPushSupplier*
 TAO_EC_Event_Channel::create_proxy_push_supplier (void)
 {
@@ -93,15 +67,15 @@ TAO_EC_Event_Channel::destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer* con
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_EC_Event_Channel::supplier_poa (void)
+TAO_EC_Event_Channel::supplier_poa (CORBA::Environment &ACE_TRY_ENV)
 {
-  return PortableServer::POA::_duplicate (this->supplier_poa_.in ());
+  return this->factory_->supplier_poa (ACE_TRY_ENV);
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_EC_Event_Channel::consumer_poa (void)
+TAO_EC_Event_Channel::consumer_poa (CORBA::Environment &ACE_TRY_ENV)
 {
-  return PortableServer::POA::_duplicate (this->consumer_poa_.in ());
+  return this->factory_->consumer_poa (ACE_TRY_ENV);
 }
 
 ACE_INLINE ACE_Lock*
@@ -127,57 +101,3 @@ TAO_EC_Event_Channel::destroy_supplier_lock (ACE_Lock* x)
 {
   this->factory_->destroy_supplier_lock (x);
 }
-
-ACE_INLINE ACE_Lock*
-TAO_EC_Event_Channel::create_consumer_admin_lock (void)
-{
-  return this->factory_->create_consumer_admin_lock ();
-}
-
-ACE_INLINE void
-TAO_EC_Event_Channel::destroy_consumer_admin_lock (ACE_Lock* x)
-{
-  this->factory_->destroy_consumer_admin_lock (x);
-}
-
-ACE_INLINE ACE_Lock*
-TAO_EC_Event_Channel::create_supplier_admin_lock (void)
-{
-  return this->factory_->create_supplier_admin_lock ();
-}
-
-ACE_INLINE void
-TAO_EC_Event_Channel::destroy_supplier_admin_lock (ACE_Lock* x)
-{
-  this->factory_->destroy_supplier_admin_lock (x);
-}
-
-ACE_INLINE int
-TAO_EC_Event_Channel::consumer_reconnect (void) const
-{
-  return this->consumer_reconnect_;
-}
-
-ACE_INLINE int
-TAO_EC_Event_Channel::supplier_reconnect (void) const
-{
-  return this->supplier_reconnect_;
-}
-
-ACE_INLINE RtecScheduler::Scheduler_ptr
-TAO_EC_Event_Channel::scheduler (void)
-{
-  return RtecScheduler::Scheduler::_duplicate (this->scheduler_.in ());
-}
-
-ACE_INLINE int
-TAO_EC_Event_Channel::busy_hwm (void) const
-{
-  return this->busy_hwm_;
-}
-
-ACE_INLINE int
-TAO_EC_Event_Channel::max_write_delay (void) const
-{
-  return this->max_write_delay_;
-}