Thu Apr 24 11:10:32 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

14 files changed, 49 insertions, 64 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index 3beb7953c63..76a5973b439 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -102,8 +102,7 @@ TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types)
 int
 TAO_Notify_Admin::shutdown (void)
 {
-  int sd_ret = TAO_Notify_Object::shutdown ();
-  if (sd_ret == 1)
+  if (TAO_Notify_Object::shutdown () == 1)
     return 1;
 
   this->proxy_container().shutdown ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
index 381feb63d99..d16b3dde9c3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
@@ -56,8 +56,7 @@ public:
   /// Insert the proxy in the <proxy_container_>.
   void insert (TAO_Notify_Proxy* proxy);
 
-  /// Remove type from container_
-  /// and cleanup any EC resources.
+  /// Remove type from container_ and cleanup any EC resources.
   void cleanup_proxy (TAO_Notify_Proxy *proxy, bool is_supplier);
 
   /// Access Admin FilterAdmin.
@@ -74,6 +73,7 @@ public:
   void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types);
 
   TAO_Notify_EventChannel * event_channel () const;
+
   /// Shutdown
   virtual int shutdown (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
index 163e22dc13c..09a07d798eb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
@@ -50,10 +50,10 @@ public:
   /// Destructor
   virtual ~TAO_Notify_AdminProperties ();
 
-  // Init
+  /// Init
   int init (const CosNotification::PropertySeq& prop_seq);
 
-  // finish initialization after values are set by topology load
+  /// finish initialization after values are set by topology load
   void init ();
 
   // = Const Accessors
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
index df5254fea9e..52badbee8a3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
@@ -117,7 +117,6 @@ private:
   TAO_Notify_Property_Long max_events_per_consumer_;
   TAO_Notify_Property_Time blocking_policy_;
 
-
   TAO_SYNCH_CONDITION& global_not_full_;
   TAO_SYNCH_CONDITION local_not_full_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
index 095a51492ff..6212caeac3f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -70,10 +70,10 @@ public:
   /// Dispatch Event to consumer
   void deliver (TAO_Notify_Method_Request_Event * request);
 
-  /// Push <event> to this consumer.
+  /// Push @a event to this consumer.
   virtual void push (const CORBA::Any& event) = 0;
 
-  /// Push <event> to this consumer.
+  /// Push @a event to this consumer.
   virtual void push (const CosNotification::StructuredEvent& event) = 0;
 
   /// Push a batch of events to this consumer.
@@ -97,10 +97,9 @@ public:
   /// Shutdown the consumer
   virtual void shutdown (void);
 
-  /// on reconnect we need to move events from the old consumer
+  /// On reconnect we need to move events from the old consumer
   /// to the new one
-  virtual void reconnect_from_consumer (
-    TAO_Notify_Consumer* old_consumer) = 0;
+  virtual void reconnect_from_consumer (TAO_Notify_Consumer* old_consumer) = 0;
 
   /// Override, Peer::qos_changed
   virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
index df0cb1c6fdd..0c8fc82098e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
@@ -89,15 +89,11 @@ protected:
   /// = CosNotifyChannelAdmin::ConsumerAdmin methods
   virtual CosNotifyChannelAdmin::AdminID MyID (void);
 
-  virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (
-
-  );
+  virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void);
 
   virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void);
 
-  virtual ::CosNotifyFilter::MappingFilter_ptr priority_filter (
-
-  );
+  virtual ::CosNotifyFilter::MappingFilter_ptr priority_filter (void);
 
   virtual void priority_filter (CosNotifyFilter::MappingFilter_ptr priority_filter);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index 91305df0485..b47b6116e31 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -5,8 +5,6 @@
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_ETCL_FILTER_H
@@ -55,8 +53,7 @@ protected:
   virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list);
 
   virtual void modify_constraints (const CosNotifyFilter::ConstraintIDSeq & del_list,
-                                   const CosNotifyFilter::ConstraintInfoSeq & modify_list
-                                   );
+                                   const CosNotifyFilter::ConstraintInfoSeq & modify_list);
 
   virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list);
 
@@ -83,16 +80,16 @@ private:
 
   void remove_all_constraints_i (void);
 
+  /**
+   * Structure for associating ConstraintInfo with an interpreter.
+   */
   struct TAO_Notify_Constraint_Expr
   {
-    // = DESCRIPTION
-    //   Structure for associating ConstraintInfo with an interpreter.
-    //
+    /// Constraint Expression.
     CosNotifyFilter::ConstraintExp constr_expr;
-    // Constraint Expression.
 
+    /// Constraint Interpreter.
     TAO_Notify_Constraint_Interpreter interpreter;
-    // Constraint Interpreter.
   };
 
   /// Lock to serialize access to data members.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
index e152c4d981f..dc1c01609c3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
@@ -124,10 +124,10 @@ private:
 
   TAO_SYNCH_MUTEX default_admin_mutex_;
 
-  // Default Consumer Admin
+  /// Default Consumer Admin
   CosNotifyChannelAdmin::ConsumerAdmin_var default_consumer_admin_;
 
-  // Default Supplier Admin
+  /// Default Supplier Admin
   CosNotifyChannelAdmin::SupplierAdmin_var default_supplier_admin_;
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
index eeb6f245191..5eaf5d049f1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
@@ -55,7 +55,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory
 public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_EventChannelFactory > Ptr;
 
-  /// Constuctor
+  /// Constructor
   TAO_Notify_EventChannelFactory (void);
 
   /// Init the factory
@@ -104,7 +104,7 @@ public:
   CosNotifyChannelAdmin::EventChannelFactory_ptr activate_self (void);
   virtual void reconnect (void);
 
-  /// handle change notifications
+  /// Handle change notifications
   bool handle_change (void);
 
   void load_event_persistence (void);
@@ -159,7 +159,7 @@ private:
 
   CosNotifyChannelAdmin::EventChannelFactory_var channel_factory_;
 
-  /// change-in-progress detector to avoid duplicates
+  /// Change-in-progress detector to avoid duplicates
   short topology_save_seq_;
   TAO_Notify::Topology_Factory* topology_factory_;
   TAO_Notify::Reconnection_Registry reconnect_registry_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
index 0144ac788af..0985dc59a03 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
@@ -5,8 +5,6 @@
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_EVENTTYPE_H
@@ -62,14 +60,14 @@ public:
   /// != operator
   bool operator!=(const TAO_Notify_EventType& notify_event_type) const;
 
+  /// Return the special event type.
   static TAO_Notify_EventType special (void);
-  // Return the special event type.
 
+  /// Is this the special event (accept everything).
   CORBA::Boolean is_special (void) const;
-  // Is this the special event (accept everything).
 
+  /// Get the type underneath us.
   const CosNotification::EventType& native (void) const;
-  // Get the type underneath us.
 
   /// Helper to print contents.
   void dump (void) const;
@@ -85,18 +83,18 @@ protected:
   /// Init this object.
   void init_i (const char* domain_name, const char* type_name);
 
+  /// Recompute the hash value.
   void recompute_hash (void);
-  // Recompute the hash value.
 
   bool domain_is_wildcard (const char* domain) const;
   bool type_is_wildcard (const char* type) const;
-  
+
   // = Data Members
+  /// The event_type that we're decorating.
   CosNotification::EventType event_type_;
-  // The event_type that we're decorating.
 
+  /// The hash value computed.
   u_long hash_value_;
-  // The hash value computed.
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
index b2b93b76d77..eb9c15d03c5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
@@ -65,7 +65,7 @@ public:
   void populate (CosNotification::EventTypeSeq& event_type) const;
 
   /// Populate <event_type_seq> with the contents of this object.
-  // Excludes the special event type. This is used to avoid sending * type updates to proxys.
+  /// Excludes the special event type. This is used to avoid sending * type updates to proxys.
   void populate_no_special (CosNotification::EventTypeSeq& event_type) const;
 
   /// Print the contents.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h
index 0abc936b92a..29baa5f1f50 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h
@@ -44,7 +44,6 @@ namespace TAO_Notify
     /// Begin the reload process by returning the first Routing_Slip_Persistence_Manager
     /// to continue call Routing_Slip_Persistence_Manager::load_next ()
     virtual Routing_Slip_Persistence_Manager * first_reload_manager () = 0;
-
   };
 } // namespace TAO_Notify
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
index f6596be8410..03d9eb73c13 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
@@ -46,7 +46,7 @@ public:
   void set_last_used (const TAO_Notify_Object::ID id);
 
 private:
-  // Can't use atomic op, because we added the set_last_used() method.
+  /// Can't use atomic op, because we added the set_last_used() method.
   TAO_Notify_Object::ID seed_;
   TAO_SYNCH_MUTEX mtx_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index bedf346116a..0e8fca3488d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -170,8 +170,7 @@ TAO_Notify_SupplierAdmin::obtain_notification_push_consumer (CosNotifyChannelAdm
 CosNotifyChannelAdmin::ProxyConsumer_ptr
 TAO_Notify_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyChannelAdmin::ClientType ctype,
                                                                   CosNotifyChannelAdmin::ProxyID_out proxy_id,
-                                                                  const CosNotification::QoSProperties & initial_qos
-                                                                  )
+                                                                  const CosNotification::QoSProperties & initial_qos)
 {
   CosNotifyChannelAdmin::ProxyConsumer_var proxy =
     TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
@@ -228,8 +227,7 @@ TAO_Notify_SupplierAdmin::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID pro
 
 void
 TAO_Notify_SupplierAdmin::offer_change (const CosNotification::EventTypeSeq & added,
-                                    const CosNotification::EventTypeSeq & removed
-                                    )
+                                        const CosNotification::EventTypeSeq & removed)
 
 {
   TAO_Notify_EventTypeSeq seq_added (added);
@@ -280,6 +278,22 @@ TAO_Notify_SupplierAdmin::remove_all_filters (void)
   this->filter_admin_.remove_all_filters ();
 }
 
+TAO_Notify_ProxyConsumer *
+TAO_Notify_SupplierAdmin::find_proxy_consumer (
+    TAO_Notify::IdVec & id_path,
+    size_t position)
+{
+  TAO_Notify_ProxyConsumer * result = 0;
+  size_t path_size = id_path.size ();
+  if (position < path_size)
+  {
+    TAO_Notify_ProxyConsumer_Find_Worker find_worker;
+    TAO_Notify_Proxy * proxy = find_worker.find (id_path[position], this->proxy_container());
+    result = dynamic_cast <TAO_Notify_ProxyConsumer *> (proxy);
+  }
+  return result;
+}
+
 /************** UNIMPLEMENTED METHODS ***************/
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
@@ -309,20 +323,4 @@ TAO_Notify_SupplierAdmin::obtain_notification_pull_consumer (CosNotifyChannelAdm
   throw CORBA::NO_IMPLEMENT ();
 }
 
-TAO_Notify_ProxyConsumer *
-TAO_Notify_SupplierAdmin::find_proxy_consumer (
-    TAO_Notify::IdVec & id_path,
-    size_t position)
-{
-  TAO_Notify_ProxyConsumer * result = 0;
-  size_t path_size = id_path.size ();
-  if (position < path_size)
-  {
-    TAO_Notify_ProxyConsumer_Find_Worker find_worker;
-    TAO_Notify_Proxy * proxy = find_worker.find (id_path[position], this->proxy_container());
-    result = dynamic_cast <TAO_Notify_ProxyConsumer *> (proxy);
-  }
-  return result;
-}
-
 TAO_END_VERSIONED_NAMESPACE_DECL