1 files changed, 2 insertions, 23 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index 50835bec895..e5ba8e67229 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -66,6 +66,8 @@ public:
   // The gateway must disconnect from all the relevant event channels,
   // or any other communication media (such as multicast groups).
 
+private:
+  friend class ACE_EventChannel;
   void observer_handle (RtecEventChannelAdmin::Observer_Handle h);
   RtecEventChannelAdmin::Observer_Handle observer_handle (void) const;
   // Obtain and modify the observer handle.
@@ -143,25 +145,6 @@ public:
                                 CORBA::Environment& env);
 
 private:
-  void close_i (CORBA::Environment& );
-
-  void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub,
-                          CORBA::Environment& env);
-
-private:
-  ACE_SYNCH_MUTEX lock_;
-  // Lock to synchronize internal changes
-
-  CORBA::ULong busy_count_;
-  // How many threads are running push() we cannot make changes until
-  // that reaches 0
-
-  int update_posted_;
-  RtecEventChannelAdmin::ConsumerQOS c_qos_;
-  // An update_consumer() message arrived *while* we were doing a
-  // push() the modification is stored <pub_>, if multiple
-  // update_consumer messages arrive only the last one is executed.
-
   RtecEventChannelAdmin::EventChannel_var rmt_ec_;
   RtecEventChannelAdmin::EventChannel_var lcl_ec_;
   // The remote and the local EC, so we can reconnect when the list changes.
@@ -172,13 +155,9 @@ private:
 
   ACE_PushConsumer_Adapter<TAO_EC_Gateway_IIOP> consumer_;
   // Our consumer personality....
-  int consumer_is_active_;
-  // If it is not 0 then we must deactivate the supplier
 
   ACE_PushSupplier_Adapter<TAO_EC_Gateway_IIOP> supplier_;
   // Our supplier personality....
-  int supplier_is_active_;
-  // If it is not 0 then we must deactivate the supplier
 
   // We use a different Consumer_Proxy
   typedef ACE_Map_Manager<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr,ACE_Null_Mutex> Consumer_Map;