diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp | 42 |
1 files changed, 16 insertions, 26 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp index 4d7a0c3023d..0f1733335f3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp @@ -1,23 +1,21 @@ // $Id$ -#include "orbsvcs/Notify/ProxySupplier.h" +#include "ProxySupplier.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/ProxySupplier.inl" +#include "ProxySupplier.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Notify, TAO_Notify_ProxySupplier, "$Id$") +ACE_RCSID(RT_Notify, TAO_Notify_ProxySupplier, "$Id$") -#include "orbsvcs/Notify/Event_Manager.h" -#include "orbsvcs/Notify/AdminProperties.h" -#include "orbsvcs/Notify/Consumer.h" -#include "orbsvcs/Notify/Method_Request_Dispatch.h" -#include "orbsvcs/Notify/Worker_Task.h" -#include "orbsvcs/Notify/Buffering_Strategy.h" -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/ConsumerAdmin.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Event_Manager.h" +#include "AdminProperties.h" +#include "Consumer.h" +#include "Method_Request_Dispatch.h" +#include "Worker_Task.h" +#include "Buffering_Strategy.h" +#include "Properties.h" +#include "ConsumerAdmin.h" TAO_Notify_ProxySupplier::TAO_Notify_ProxySupplier (void) : consumer_admin_ (0) @@ -34,7 +32,6 @@ TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV ACE_ASSERT (consumer_admin != 0 && this->consumer_admin_.get() == 0); TAO_Notify_Proxy::initialize (consumer_admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->consumer_admin_.reset (consumer_admin); @@ -42,7 +39,6 @@ TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV TAO_Notify_PROPERTIES::instance ()->default_proxy_supplier_qos_properties (); this->set_qos (default_ps_qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } TAO_Notify_Peer* @@ -77,8 +73,8 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DEC // if consumer is set and reconnect not allowed we get out. if (this->is_connected () && TAO_Notify_PROPERTIES::instance()->allow_reconnect() == false) { - ACE_THROW (CosEventChannelAdmin::AlreadyConnected ()); - } + ACE_THROW (CosEventChannelAdmin::AlreadyConnected ()); + } // Adopt the consumer this->consumer_ = auto_consumer; @@ -94,7 +90,6 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DEC TAO_Notify_EventTypeSeq removed; this->event_manager().subscription_change (this, this->subscribed_types_, removed ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->event_manager().connect (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -139,16 +134,13 @@ TAO_Notify_ProxySupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL) void TAO_Notify_ProxySupplier::destroy (ACE_ENV_SINGLE_ARG_DECL) { - int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - if ( result == 1) + if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1) return; - this->consumer_admin_->remove (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - // Do not reset this->consumer_. - // It is not safe to delete the non-refcounted consumer here. + this->consumer_admin_->remove (this ACE_ENV_ARG_PARAMETER); + ACE_CHECK; } void @@ -162,5 +154,3 @@ TAO_Notify_ProxySupplier::qos_changed (const TAO_Notify_QoSProperties& qos_prope { TAO_Notify_Proxy::qos_changed (qos_properties); } - -TAO_END_VERSIONED_NAMESPACE_DECL |