diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-19 17:25:41 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-19 17:25:41 +0000 |
| commit | 464cf6d1bbf063c86b5fc6433e154b2b52733409 (patch) | |
| tree | f4bd4f780bc072e18d074dada059a8bdc26ff571 /TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp | |
| parent | ee27749de8d109fe86ae909a2f3f0316cb742caa (diff) | |
| download | ATCD-464cf6d1bbf063c86b5fc6433e154b2b52733409.tar.gz | |
ChangeLogTag:Mon Mar 19 09:05:40 2001 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index 3e7143a7c68..8a271d2bd4d 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -841,7 +841,7 @@ ECM_Consumer::disconnect (CORBA::Environment& ACE_TRY_ENV) || CORBA::is_nil (this->consumer_admin_.in ())) return; - + RtecEventChannelAdmin::ProxyPushSupplier_var tmp = this->supplier_proxy_._retn (); tmp->disconnect_push_supplier (ACE_TRY_ENV); @@ -851,9 +851,20 @@ ECM_Consumer::disconnect (CORBA::Environment& ACE_TRY_ENV) void ECM_Consumer::close (CORBA::Environment &ACE_TRY_ENV) { - this->disconnect (ACE_TRY_ENV); - this->consumer_admin_ = - RtecEventChannelAdmin::ConsumerAdmin::_nil (); + ACE_TRY + { + this->disconnect (ACE_TRY_ENV); + ACE_TRY_CHECK; + this->consumer_admin_ = + RtecEventChannelAdmin::ConsumerAdmin::_nil (); + } + ACE_CATCHANY + { + this->consumer_admin_ = + RtecEventChannelAdmin::ConsumerAdmin::_nil (); + ACE_RE_THROW; + } + ACE_ENDTRY; } void |