diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp index b1d6d23fb99..259ff018bf4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp @@ -27,7 +27,7 @@ TAO_EC_ProxyPushSupplier_Set::connected_i ( CORBA::Environment &ACE_TRY_ENV) { if (this->all_suppliers_.insert (supplier) != 0) - ACE_THROW (CORBA::NO_MEMORY ()); + ACE_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); } void @@ -36,23 +36,11 @@ TAO_EC_ProxyPushSupplier_Set::disconnected_i ( CORBA::Environment &ACE_TRY_ENV) { if (this->all_suppliers_.remove (supplier) != 0) - return; // ACE_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR ()); + ACE_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR ()); supplier->_decr_refcnt (); } void -TAO_EC_ProxyPushSupplier_Set::shutdown_i ( - CORBA::Environment &ACE_TRY_ENV) -{ - SupplierSetIterator end = this->end (); - for (SupplierSetIterator i = this->begin (); i != end; ++i) - { - (*i)->_decr_refcnt (); - } - this->all_suppliers_.reset (); -} - -void TAO_EC_ProxyPushSupplier_Set::execute_delayed_operations (void) { } @@ -66,7 +54,6 @@ template class ACE_Guard<TAO_EC_Busy_Lock_Adapter<TAO_EC_ProxyPushSupplier_Set> template class TAO_EC_Busy_Lock_Adapter<TAO_EC_ProxyPushSupplier_Set>; template class TAO_EC_Connected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier>; template class TAO_EC_Disconnected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier>; -template class TAO_EC_Shutdown_Command<TAO_EC_ProxyPushSupplier_Set>; #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) @@ -77,6 +64,5 @@ template class TAO_EC_Shutdown_Command<TAO_EC_ProxyPushSupplier_Set>; #pragma instantiate ACE_Guard<TAO_EC_Busy_Lock_Adapter<TAO_EC_ProxyPushSupplier_Set> > #pragma instantiate TAO_EC_Connected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier> #pragma instantiate TAO_EC_Disconnected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier> -#pragma instantiate TAO_EC_Shutdown_Command<TAO_EC_ProxyPushSupplier_Set> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |