diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h index c3c6252d93c..4f7ffa598b2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h @@ -17,17 +17,13 @@ // ========================================================================== #ifndef TAO_NOTIFY_PROXYPUSHSUPPLIER_I_H #define TAO_NOTIFY_PROXYPUSHSUPPLIER_I_H - #include "ace/pre.h" -#include "Notify_ProxySupplier_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "Notify_ProxySupplier_T.h" #include "orbsvcs/CosNotifyChannelAdminS.h" class TAO_Notify_ConsumerAdmin_i; +class TAO_Notify_Resource_Manager; #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -36,7 +32,7 @@ class TAO_Notify_ConsumerAdmin_i; #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_Notify_Export TAO_Notify_ProxyPushSupplier_i : public TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::ProxyPushSupplier> +class TAO_Notify_Export TAO_Notify_ProxyPushSupplier_i : public TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::ProxyPushSupplier>, public PortableServer::RefCountServantBase { // = TITLE // TAO_Notify_ProxyPushSupplier_i @@ -46,7 +42,8 @@ class TAO_Notify_Export TAO_Notify_ProxyPushSupplier_i : public TAO_Notify_Proxy // public: - TAO_Notify_ProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumeradmin); + TAO_Notify_ProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumeradmin, + TAO_Notify_Resource_Manager* resource_manager); // Constructor virtual ~TAO_Notify_ProxyPushSupplier_i (void); @@ -70,31 +67,27 @@ virtual void disconnect_push_supplier ( CORBA::SystemException )); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV); - // Shutdown. - protected: - void shutdown_i (CORBA::Environment &ACE_TRY_ENV); - // Shutdown - virtual void dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV); - // Deliver the event to the consumer. + // Deliver the event to the consumer. virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV); - // Deliver the update to the consumer. + // Deliver the update to the consumer. + + // = Helper methods + virtual void cleanup_i (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + // Cleanup all resources used by this object. - // = Data Members. - CORBA::Boolean notify_style_consumer_; + CORBA::Boolean notify_style_consumer_; // True if the consumer supports the NotifyPublish interface. // If it does, we use the <notify_push_consumer_> else <cosec_push_consumer_> - CosEventComm::PushConsumer_var cosec_push_consumer_; - CosNotifyComm::PushConsumer_var notify_push_consumer_; - // The consumer connected to us. + CosEventComm::PushConsumer_var cosec_push_consumer_; + CosNotifyComm::PushConsumer_var notify_push_consumer_; + // The consumer connected to us. - private: - typedef TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::ProxyPushSupplier> - proxy_inherited; + typedef TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::ProxyPushSupplier> + proxy_inherited; }; class TAO_Notify_Export TAO_Notify_CosEC_ProxyPushSupplier_i : public POA_CosEventChannelAdmin::ProxyPushSupplier, public virtual PortableServer::RefCountServantBase @@ -108,7 +101,7 @@ class TAO_Notify_Export TAO_Notify_CosEC_ProxyPushSupplier_i : public POA_CosEve // public: // = Initialization and termination methods. - TAO_Notify_CosEC_ProxyPushSupplier_i(TAO_Notify_ConsumerAdmin_i* consumeradmin); + TAO_Notify_CosEC_ProxyPushSupplier_i(TAO_Notify_ConsumerAdmin_i* consumeradmin, TAO_Notify_Resource_Manager* resource_manager); // Constructor. ~TAO_Notify_CosEC_ProxyPushSupplier_i (void); @@ -128,7 +121,6 @@ public: // Connects the <push_consumer> to the Event Channel. protected: - // = Data Members TAO_Notify_ProxyPushSupplier_i notify_proxy_; // The proxy that we delegate too. }; |