diff options
Diffstat (limited to 'TAO')
5 files changed, 9 insertions, 12 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 924df2840f0..ebe62a6e427 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,12 @@ +Wed Apr 19 11:00:16 2000 Carlos O'Ryan <coryan@uci.edu> + + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp: + Deactivation of the proxies is handled by the ESF classes, we + don't need to do that anymore. + Wed Apr 19 10:55:36 2000 Carlos O'Ryan <coryan@uci.edu> * docs/tutorials/Quoter/AMI/Makefile: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index 742cc3caf53..04a9a2c5e6e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -332,9 +332,6 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ( this->cleanup_i (); } - this->deactivate (ACE_TRY_ENV); - ACE_CHECK; - // Notify the event channel... this->event_channel_->disconnected (this, ACE_TRY_ENV); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index 9134639d795..a4e2c403234 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -293,9 +293,6 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ( this->cleanup_i (); } - this->deactivate (ACE_TRY_ENV); - ACE_CHECK; - // Notify the event channel.... this->event_channel_->disconnected (this, ACE_TRY_ENV); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index 77e16b469e3..56db5146cde 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -250,9 +250,6 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ( this->cleanup_i (); } - this->deactivate (ACE_TRY_ENV); - ACE_CHECK; - // Notify the event channel... this->event_channel_->disconnected (this, ACE_TRY_ENV); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index 77e1fe55db3..60a55930b6d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -268,9 +268,6 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ( this->cleanup_i (); } - this->deactivate (ACE_TRY_ENV); - ACE_CHECK; - // Notify the event channel.... this->event_channel_->disconnected (this, ACE_TRY_ENV); ACE_CHECK; |