diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-23 23:10:51 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-23 23:10:51 +0000 |
| commit | d45ef7a906325bd8ba2e1de35a3be5400c4c5ba6 (patch) | |
| tree | 30f2931aaad58afaf072d79c70c778aededf43b2 | |
| parent | 65c2aa0fe261fdbb08027e96fe4f7d2a225edd27 (diff) | |
| download | ATCD-d45ef7a906325bd8ba2e1de35a3be5400c4c5ba6.tar.gz | |
ChangeLogTag:Fri Jan 23 17:08:45 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/Event_Service/Event_Channel.h | 13 | ||||
| -rw-r--r-- | TAO/orbsvcs/Event_Service/Event_Channel.i | 12 |
3 files changed, 15 insertions, 17 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index f29a256770b..7944871505a 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,10 @@ +Fri Jan 23 17:08:45 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * orbsvcs/Event_Service/Event_Channel.h: + * orbsvcs/Event_Service/Event_Channel.i: + Fixed problem with Event Channel, it was using _this + unproperly. + Fri Jan 23 16:49:19 1998 Chris Cleeland <cleeland@cs.wustl.edu> * tests/Param_Test/{server.cpp,param_test_i.h,param_test_i.cpp}: diff --git a/TAO/orbsvcs/Event_Service/Event_Channel.h b/TAO/orbsvcs/Event_Service/Event_Channel.h index da26e4cf0e6..9d5f798f242 100644 --- a/TAO/orbsvcs/Event_Service/Event_Channel.h +++ b/TAO/orbsvcs/Event_Service/Event_Channel.h @@ -235,9 +235,6 @@ private: ACE_ES_MUTEX lock_; // Used to lock shared state. - RtecEventChannelAdmin::EventChannel_ptr me_; - // CORBA reference to self. - int destroyed_; // Ensures this->destory is executed only once. }; @@ -862,8 +859,6 @@ private: ACE_EventChannel *channel_; // Used to test for shutdown. - RtecEventChannelAdmin::ConsumerAdmin_ptr me_; - ACE_ES_Dispatching_Module *down_; // Next module down. }; @@ -1126,8 +1121,6 @@ private: ACE_ES_MUTEX lock_; // Protects access to all_suppliers_ and type_suppliers_; - RtecEventChannelAdmin::SupplierAdmin_ptr me_; - ACE_ES_Subscription_Module *up_; ACE_EventChannel *channel_; @@ -1208,9 +1201,6 @@ private: RtecEventComm::EventSourceID source_id_; // We keep a proxy of the Supplier source_id_; - RtecEventChannelAdmin::ProxyPushConsumer_ptr me_; - // CORBA reference to self. - RtecEventComm::PushSupplier_ptr push_supplier_; // CORBA reference to remote push supplier. }; @@ -1280,9 +1270,6 @@ private: // A hook so that the Correlation Module can associate correlation // information with the consumer. - RtecEventChannelAdmin::ProxyPushSupplier_ptr me_; - // CORBA reference to self. - RtecEventComm::PushConsumer_ptr push_consumer_; // Reference to our push consumer. diff --git a/TAO/orbsvcs/Event_Service/Event_Channel.i b/TAO/orbsvcs/Event_Service/Event_Channel.i index 78816ed65ff..4e1eb79db94 100644 --- a/TAO/orbsvcs/Event_Service/Event_Channel.i +++ b/TAO/orbsvcs/Event_Service/Event_Channel.i @@ -54,7 +54,8 @@ ACE_Push_Supplier_Proxy::source_id (void) ACE_INLINE RtecEventChannelAdmin::ProxyPushSupplier_ptr ACE_Push_Consumer_Proxy::get_ref (void) { - return RtecEventChannelAdmin::ProxyPushSupplier::_duplicate(me_); + CORBA::Environment env; + return this->_this (env); } ACE_INLINE RtecEventChannelAdmin::ConsumerQOS & @@ -110,13 +111,15 @@ ACE_Push_Consumer_Proxy::correlation (void) ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr ACE_ES_Consumer_Module::get_ref (void) { - return RtecEventChannelAdmin::ConsumerAdmin::_duplicate(me_); + CORBA::Environment env; + return this->_this (env); } ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr ACE_ES_Supplier_Module::get_ref (void) { - return RtecEventChannelAdmin::SupplierAdmin::_duplicate(me_); + CORBA::Environment env; + return this->_this (env); } // ************************************************** @@ -124,7 +127,8 @@ ACE_ES_Supplier_Module::get_ref (void) ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr ACE_EventChannel::get_ref (void) { - return RtecEventChannelAdmin::EventChannel::_duplicate(me_); + CORBA::Environment env; + return this->_this (env); } ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr |