diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp index 1eb81f13a4c..630b85d616a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp @@ -114,16 +114,9 @@ TAO_EC_Gateway_IIOP::close_i (CORBA::Environment &ACE_TRY_ENV) RtecEventComm::PushConsumer_ptr consumer = (*j).int_id_; if (CORBA::is_nil (consumer)) continue; - ACE_TRY - { - consumer->disconnect_push_consumer (ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - } - ACE_ENDTRY; + consumer->disconnect_push_consumer (ACE_TRY_ENV); CORBA::release (consumer); + ACE_CHECK; } // Remove all the elements on the map. Calling close() does not // work because the map is left in an inconsistent state. @@ -448,7 +441,6 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events, { this->update_posted_ = 0; this->update_consumer_i (this->c_qos_, ACE_TRY_ENV); - ACE_CHECK; } } |