*** empty log message ***

1 files changed, 21 insertions, 6 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index da157a43385..807bcf152f3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -20,19 +20,20 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 #include "Event.h"
-#include "Supplier.h"
 #include "Proxy.h"
 #include "orbsvcs/CosEventChannelAdminC.h"
 
+class TAO_NS_SupplierAdmin;
+class TAO_NS_Supplier;
+
 /**
  * @class TAO_NS_ProxyConsumer
  *
  * @brief Base class for all types of ProxyConsumer implementations.
  *
  */
-class TAO_Notify_Export TAO_NS_ProxyConsumer : public TAO_NS_Proxy
+class TAO_Notify_Export TAO_NS_ProxyConsumer : public virtual TAO_NS_Proxy
 {
 public:
   /// Constuctor
@@ -41,6 +42,9 @@ public:
   /// Destructor
   ~TAO_NS_ProxyConsumer ();
 
+  /// Init
+  void init (TAO_NS_SupplierAdmin* supplier_admin ACE_ENV_ARG_DECL);
+
   /// Connect
   void connect (TAO_NS_Supplier* supplier ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
@@ -49,11 +53,15 @@ public:
                      ));
 
   /// Disconnect
-  void disconnect (void);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Shutdown  (TAO_NS_Container_T method)
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
+
+  /// Destroy this object.
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
 
+  /// Start event propagation.
   virtual void push (TAO_NS_Event_var &event);
 
   /// Access our Peer.
@@ -62,10 +70,17 @@ public:
   /// Access the Supplier
   TAO_NS_Supplier* supplier (void);
 
-protected:
   /// Return 1 if connected
   int is_connected (void);
 
+  /// The SA parent.
+  TAO_NS_SupplierAdmin* supplier_admin (void);
+
+protected:
+  ///= Data Members.
+  /// The SA parent.
+  TAO_NS_SupplierAdmin* supplier_admin_;
+
   /// The Supplier that we're connect to.
   TAO_NS_Supplier* supplier_;
 };