Thu Jul 5 06:22:00 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

12 files changed, 175 insertions, 190 deletions

diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
index 6068c9bacbf..a05e1708f65 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
@@ -1,24 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    NT_Naming_Service.h
-//
-//
-// = DESCRIPTION
-//    Run the TAO Naming Service as a Windows NT Service.
-//
-// = AUTHORS
-//    John Tucker <jtucker@infoglide.com> and
-//    Mike Vitalo <mvitalo@infoglide.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    NT_Naming_Service.h
+ *
+ *  $Id$
+ *
+ *  Run the TAO Naming Service as a Windows NT Service.
+ *
+ *
+ *  @author John Tucker <jtucker@infoglide.com> and Mike Vitalo <mvitalo@infoglide.com>
+ */
+//=============================================================================
+
 
 #ifndef TAO_NT_NAMING_SERVICE_H
 #define TAO_NT_NAMING_SERVICE_H
@@ -32,10 +27,13 @@
 #include /**/ "ace/Synch.h"
 #include /**/ "tao/orbconf.h"
 
+/**
+ * @class TAO_NT_Naming_Service
+ *
+ * @brief Run the TAO Naming Service as a Windows NT Service.
+ */
 class TAO_NT_Naming_Service : public ACE_NT_Service
 {
-  // = TITLE
-  //    Run the TAO Naming Service as a Windows NT Service.
 public:
   typedef TAO_SYNCH_RECURSIVE_MUTEX MUTEX;
 
@@ -43,30 +41,30 @@ public:
   TAO_NT_Naming_Service (void);
   virtual ~TAO_NT_Naming_Service (void);
 
+  /// We override <handle_control> because it handles stop requests
+  /// privately.
   virtual void handle_control (DWORD control_code);
-  // We override <handle_control> because it handles stop requests
-  // privately.
 
+  /// We override <handle_exception> so a 'stop' control code can pop
+  /// the reactor off of its wait.
   virtual int handle_exception (ACE_HANDLE h);
-  // We override <handle_exception> so a 'stop' control code can pop
-  // the reactor off of its wait.
 
+  /// This is a virtual method inherited from ACE_NT_Service.
   virtual int svc (void);
-  // This is a virtual method inherited from ACE_NT_Service.
 
+  /// Initialize the objects argc_ and argv_ attributes values.
   virtual int init (int argc,
                     ACE_TCHAR *argv[]);
-  // Initialize the objects argc_ and argv_ attributes values.
 
 private:
   // = Keep track of the "command-line" arguments.
+  /// Argument count.
   int argc_;
   int argc_save_;
-  // Argument count.
 
+  /// Argument list.
   char **argv_;
   char **argv_save_;
-  // Argument list.
 
   friend class ACE_Singleton<TAO_NT_Naming_Service, MUTEX>;
   friend class AutoFinalizer;
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index cee5062bfff..f6885365f7e 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -15,8 +15,7 @@ TAO_Naming_Service::TAO_Naming_Service (void)
 }
 
 // Constructor taking command-line arguments.
-TAO_Naming_Service::TAO_Naming_Service (int argc,
-                                        ACE_TCHAR* argv[])
+TAO_Naming_Service::TAO_Naming_Service (int argc, ACE_TCHAR* argv[])
   : time_ (0)
 {
   this->init (argc, argv);
@@ -25,8 +24,7 @@ TAO_Naming_Service::TAO_Naming_Service (int argc,
 
 // Initialize the state of the TAO_Naming_Service object
 int
-TAO_Naming_Service::init (int argc,
-                          ACE_TCHAR* argv[])
+TAO_Naming_Service::init (int argc, ACE_TCHAR* argv[])
 {
   int result;
 
@@ -63,8 +61,7 @@ TAO_Naming_Service::init (int argc,
 }
 
 int
-TAO_Naming_Service::parse_args (int &argc,
-                                ACE_TCHAR* argv[])
+TAO_Naming_Service::parse_args (int &argc, ACE_TCHAR* argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("-t:"));
   int c;
@@ -125,7 +122,6 @@ TAO_Naming_Service::shutdown (void)
 int
 TAO_Naming_Service::fini (void)
 {
-
   this->my_naming_server_.fini();
 
   try
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h
index c4fe070a996..63b182fe4a4 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h
@@ -1,76 +1,72 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs/Naming_Service/Naming_Service
-//
-// = FILENAME
-//    Naming_Service.h
-//
-// = DESCRIPTION
-//      This class implements the functionality of a Naming_Service in
-//      a stand-alone process.
-//
-// = AUTHORS
-//    Nagarajan Surendran (naga@cs.wustl.edu)
-//    Marina Spivak <marina@cs.wustl.edu>
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Naming_Service.h
+ *
+ *  $Id$
+ *
+ *    This class implements the functionality of a Naming_Service in
+ *    a stand-alone process.
+ *
+ *
+ *  @author Nagarajan Surendran (naga@cs.wustl.edu) Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_NAMING_SERVICE_H
 #define TAO_NAMING_SERVICE_H
 
 #include "orbsvcs/Naming/Naming_Server.h"
 
+/**
+ * @class TAO_Naming_Service
+ *
+ * @brief Defines a class that encapsulates the implementation of the
+ * COS Naming Service.
+ *
+ * This class makes use of the <TAO_Naming_Server>
+ * to implement the COS Naming Service.
+ */
 class TAO_Naming_Service
 {
-  // = TITLE
-  //   Defines a class that encapsulates the implementation of the
-  //   COS Naming Service.
-  //
-  // = DESCRIPTION
-  //   This class makes use of the <TAO_Naming_Server>
-  //   to implement the COS Naming Service.
 public:
+  /// Default Constructor.
   TAO_Naming_Service (void);
-  // Default Constructor.
 
+  /// Constructor taking the command-line arguments.
   TAO_Naming_Service (int argc, ACE_TCHAR* argv[]);
-  // Constructor taking the command-line arguments.
 
+  /// Initialize the Naming Service with the arguments.
   virtual int init (int argc, ACE_TCHAR* argv[]);
-  // Initialize the Naming Service with the arguments.
 
+  /// The opposite of init().
   virtual int fini (void);
-  // The opposite of init().
 
+  /// Run the TAO_Naming_Service.
   int run (void);
-  // Run the TAO_Naming_Service.
 
+  /// Shut down the TAO_Naming_Service; you must still call fini().
   void shutdown (void);
-  // Shut down the TAO_Naming_Service; you must still call fini().
 
+  /// Destructor.
   virtual ~TAO_Naming_Service (void);
-  // Destructor.
 
 protected:
 
+  /// Parse the command line arguments to find
+  /// the timeout period.
   int parse_args (int &argc, ACE_TCHAR* argv[]);
-  // Parse the command line arguments to find
-  // the timeout period.
 
+  /// The ORB.
   CORBA::ORB_var orb_;
-  // The ORB.
-
-  //  PortableServer::POA_var root_poa_;
-  // The Root POA.
 
+  /// Naming Server instance.
   TAO_Naming_Server my_naming_server_;
-  // Naming Server instance.
 
+  /// After how long the server should stop listening to requests (in
+  /// seconds).
   long time_;
-  // After how long the server should stop listening to requests (in
-  // seconds).
 };
 
 #endif /* TAO_NAMING_SERVICE_H */
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
index f736b7b59a0..011b5a63bc2 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
@@ -1,24 +1,20 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    NT_Notify_Service.h
-//
-//
-// = DESCRIPTION
-//    Run the TAO Notify Service as a Windows NT Service.
-//
-// = AUTHORS
-//    John Tucker <jtucker@infoglide.com>,
-//    Mike Vitalo <mvitalo@infoglide.com>,
-//    David Robison <drrobison@openroadsconsulting.com> 
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    NT_Notify_Service.h
+ *
+ *  $Id$
+ *
+ *  Run the TAO Notify Service as a Windows NT Service.
+ *
+ *
+ *  @author John Tucker <jtucker@infoglide.com>
+ *  @author Mike Vitalo <mvitalo@infoglide.com>
+ *  @author David Robison <drrobison@openroadsconsulting.com> 
+ */
+//=============================================================================
+
 
 #ifndef TAO_NT_NOTIFY_SERVICE_H
 #define TAO_NT_NOTIFY_SERVICE_H
@@ -32,10 +28,13 @@
 #include /**/ "ace/Synch.h"
 #include /**/ "tao/orbconf.h"
 
+/**
+ * @class TAO_NT_Notify_Service
+ *
+ * @brief Run the TAO Notify Service as a Windows NT Service.
+ */
 class TAO_NT_Notify_Service : public ACE_NT_Service
 {
-  // = TITLE
-  //    Run the TAO Notify Service as a Windows NT Service.
 public:
   typedef TAO_SYNCH_RECURSIVE_MUTEX MUTEX;
 
@@ -43,30 +42,30 @@ public:
   TAO_NT_Notify_Service (void);
   virtual ~TAO_NT_Notify_Service (void);
 
+  /// We override <handle_control> because it handles stop requests
+  /// privately.
   virtual void handle_control (DWORD control_code);
-  // We override <handle_control> because it handles stop requests
-  // privately.
 
+  /// We override <handle_exception> so a 'stop' control code can pop
+  /// the reactor off of its wait.
   virtual int handle_exception (ACE_HANDLE h);
-  // We override <handle_exception> so a 'stop' control code can pop
-  // the reactor off of its wait.
 
+  /// This is a virtual method inherited from ACE_NT_Service.
   virtual int svc (void);
-  // This is a virtual method inherited from ACE_NT_Service.
         
+  /// Initialize the objects argc_ and argv_ attributes values.
   virtual int init (int argc,
                     ACE_TCHAR *argv[]);
-  // Initialize the objects argc_ and argv_ attributes values.
 
 private:
   // = Keep track of the "command-line" arguments.
+  /// Argument count.
   int argc_;
   int argc_save_;
-  // Argument count.
 
+  /// Argument list.
   char **argv_;
   char **argv_save_; 
-  // Argument list.
 
   friend class ACE_Singleton<TAO_NT_Notify_Service, MUTEX>;
 };
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
index aa652e311fe..e90cfe8cd31 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
@@ -50,16 +50,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   try
     {
-      // Set the properties instance before initializing the notify
-      // service.  Using the static singleton can cause static
-      // destruction issues between the properties instance and
-      // statically allocated type code structures.
-      TAO_Notify_Properties properties;
-      TAO_Notify_Properties::instance (&properties);
-
-      int result = notify_service.init (argc, argv);
-
-       if (result == -1)
+      if (notify_service.init (argc, argv) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT("Failed to initialize the Notification Service.\n")),
                           1);
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h
index 1967f1b0a8f..6efc3de6464 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h
@@ -1,18 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = FILENAME
-//   Notify_Service.h
-//
-// = AUTHORS
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//   Service options code by Wei Chiang <Wei.Chiang@nokia.com>.
-//
-// = DESCRIPTION
-//   Notification Service front end.
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Service.h
+ *
+ *  $Id$
+ *
+ * Notification Service front end.
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *  @author Service options code by Wei Chiang <Wei.Chiang@nokia.com>.
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_SERVICE_H
 #define NOTIFY_SERVICE_H
@@ -32,120 +31,123 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 #define NOTIFY_KEY "NotifyEventChannelFactory"
 #define NOTIFY_CHANNEL_NAME "NotifyEventChannel"
 
+/**
+ * @class Worker
+ *
+ * @brief Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
+  /// ctor
   Worker (void);
-  // ctor
 
   void orb (CORBA::ORB_ptr orb);
 
+  /// The thread entry point.
   virtual int svc (void);
-  // The thread entry point.
 
 private:
+  /// The orb
   CORBA::ORB_var orb_;
-  // The orb
 };
 
+/**
+ * @class TAO_Notify_Service_Driver
+ *
+ * @brief Notify_Service
+ *
+ * Implementation of the Notification Service front end.
+ */
 class TAO_Notify_Service_Driver
 {
-  // = TITLE
-  //   Notify_Service
-  //
-  // = DESCRIPTION
-  //   Implementation of the Notification Service front end.
 
  public:
   // = Initialization and termination methods.
+  /// Constructor.
   TAO_Notify_Service_Driver (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~TAO_Notify_Service_Driver (void);
-  // Destructor.
 
+  /// Initializes the Service.
+  /// Returns 0 on success, -1 on error.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initializes the Service.
-  // Returns 0 on success, -1 on error.
 
+  /// run the Service.
+  /// Returns 0 on success, -1 on error.
   int run (void);
-  // run the Service.
-  // Returns 0 on success, -1 on error.
 
+  /// Shutdown the Service.
+  /// Returns 0 on success, -1 on error.
   void shutdown (void);
-  // Shutdown the Service.
-  // Returns 0 on success, -1 on error.
 
 
   // CosNotifyChannelAdmin::EventChannelFactory_var obj;
   //
 protected:
+  /// initialize the ORB.
+  /// initialize the dispatching ORB.
   int init_ORB (int& argc, ACE_TCHAR *argv []);
-  // initialize the ORB.
   int init_dispatching_ORB (int& argc, ACE_TCHAR *argv []);
-  // initialize the dispatching ORB.
 
   TAO_Notify_Service* notify_service_;
 
+  /// Resolve the naming service.
   int resolve_naming_service (void);
-  // Resolve the naming service.
 
+  /// Parses the command line arguments.
   int parse_args (int& argc, ACE_TCHAR *argv []);
-  // Parses the command line arguments.
 
   // = Data members
 
+  /// 1: this service is bootstrappable
   int bootstrap_;
-  // 1: this service is bootstrappable
 
+  /// 1: register itself with the name service
   int use_name_svc_;
-  // 1: register itself with the name service
 
+  /// 1:
   int register_ec_;
-  // 1:
 
+  /// File where the IOR of the server object is stored.
   FILE *ior_output_file_;
-  // File where the IOR of the server object is stored.
 
+  /// The Factory name.
   ACE_CString notify_factory_name_;
-  // The Factory name.
 
+  /// The Factory name.
   ACE_CString notify_channel_name_;
-  // The Factory name.
 
+  /// 1:  create an event channel and registers it with the Naming Service with
+  ///     the name <notify_channel_name_>
   int register_event_channel_;
-  // 1:  create an event channel and registers it with the Naming Service with
-  //     the name <notify_channel_name_>
 
+  /// The Factory.
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
-  // The Factory.
 
+  /// The ORB that we use.
   CORBA::ORB_var orb_;
-  // The ORB that we use.
 
+  /// separate dispatching orb if needed.
   CORBA::ORB_var dispatching_orb_;
-  // separate dispatching orb if needed.
 
+  /// Reference to the root poa.
   PortableServer::POA_var poa_;
-  // Reference to the root poa.
 
+  /// A naming context.
   CosNaming::NamingContextExt_var naming_;
-  // A naming context.
 
+  /// Worker for TP reactor mode.
   Worker worker_;
-  // Worker for TP reactor mode.
 
+  /// Number of worker threads.
   int nthreads_;
-  // Number of worker threads.
 
+  /// indicate that a separate ORB is used for dispatching events.
   bool separate_dispatching_orb_;
-  // indicate that a separate ORB is used for dispatching events.
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
index b1313c1e5d0..000079653e1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
@@ -515,7 +515,7 @@ TAO_Notify_Builder::apply_reactive_concurrency (TAO_Notify_Object& object)
 void
 TAO_Notify_Builder::apply_thread_pool_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolParams& tp_params)
 {
-  TAO_Notify_ThreadPool_Task* worker_task;
+  TAO_Notify_ThreadPool_Task* worker_task = 0;
 
   ACE_NEW_THROW_EX (worker_task,
                     TAO_Notify_ThreadPool_Task (),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index c8555faceea..8010d9ee257 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/CosNotify_Service.h"
-#include "orbsvcs/Notify/Properties.h"
 #include "orbsvcs/Notify/Default_Factory.h"
 #include "orbsvcs/Notify/Builder.h"
 #include "ace/Sched_Params.h"
@@ -19,9 +18,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CosNotify_Service::TAO_CosNotify_Service (void)
 {
+  TAO_Notify_Properties::instance (&properties_);
 }
 
-TAO_CosNotify_Service::~TAO_CosNotify_Service ()
+TAO_CosNotify_Service::~TAO_CosNotify_Service (void)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
index 109af701092..f68fdf6fd62 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
@@ -21,6 +21,7 @@
 
 #include "orbsvcs/Notify/Service.h"
 #include "orbsvcs/Notify/Builder.h"
+#include "orbsvcs/Notify/Properties.h"
 #include "orbsvcs/Notify/Factory.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -87,6 +88,9 @@ private:
 
   /// Service component for building NS participants.
   ACE_Auto_Ptr< TAO_Notify_Builder > builder_;
+
+  /// Notify properties
+  TAO_Notify_Properties properties_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
index 73d20823325..4e71dc92d60 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
@@ -162,13 +162,13 @@ TAO_Notify_QoSProperties::init (const CosNotification::PropertySeq& prop_seq, Co
         this->stop_time_supported_.set (*this);
         this->maximum_batch_size_.set (*this);
         this->pacing_interval_.set (*this);
-    this->max_events_per_consumer_.set (*this);
-    this->discard_policy_.set (*this);
-    this->order_policy_.set (*this);
+        this->max_events_per_consumer_.set (*this);
+        this->discard_policy_.set (*this);
+        this->order_policy_.set (*this);
 
         this->thread_pool_.set (*this);
         this->thread_pool_lane_.set (*this);
-    this->blocking_policy_.set (*this);
+        this->blocking_policy_.set (*this);
   }
 
   return err_index == -1 ? 0 : 1;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
index df5b3989df0..12b9b47a9a2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
@@ -48,7 +48,6 @@ TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
     CORBA::NO_MEMORY ());
   this->timer_.reset (timer);
 
-
   TAO_Notify_Buffering_Strategy* buffering_strategy = 0;
   ACE_NEW_THROW_EX (buffering_strategy,
     TAO_Notify_Buffering_Strategy (*msg_queue (), admin_properties),
@@ -66,9 +65,9 @@ TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
   // This is done in the originating thread before the spawn to
   // avoid any race conditions.
   for ( CORBA::ULong i = 0; i < tp_params.static_threads; ++i )
-  {
-    this->_incr_refcnt();
-  }
+    {
+      this->_incr_refcnt();
+    }
 
   // Become an active object.
   if (this->ACE_Task <ACE_NULL_SYNCH>::activate (flags,
@@ -78,9 +77,9 @@ TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
   {
     // Undo the ref counts on error
     for ( CORBA::ULong i = 0; i < tp_params.static_threads; ++i )
-    {
-      this->_decr_refcnt();
-    }
+      {
+        this->_decr_refcnt();
+      }
 
     if (TAO_debug_level > 0)
     {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc
index 858b1fdd3ee..2f15cd2ce87 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, ifr_client, portableserver {
-  exename  = IFR_Inheritance_Test  
-  
+project: taoserver, ifr_client {
+  exename  = IFR_Inheritance_Test
+
   IDL_Files {
     // exclude this file
     !IFR_Inheritance_Test.idl