(start_servants): declare local "i" outside of for loop because it is reused

in a few loops.

2 files changed, 444 insertions, 444 deletions

diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index bcb675e3b90..5a358f414e2 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -23,8 +23,8 @@ Cubit_Task::Cubit_Task (void)
 Cubit_Task::Cubit_Task (const char *args,
                         const char *orbname,
                         u_int num_of_objs,
-			ACE_Barrier *barrier,
-			u_int task_id)
+                        ACE_Barrier *barrier,
+                        u_int task_id)
   : orbname_ ((char *) orbname),
     orbargs_ ((char *) args),
     num_of_objs_ (num_of_objs),
@@ -44,11 +44,11 @@ Cubit_Task::svc (void)
   int rc = this->initialize_orb ();
   if (rc == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "ORB initialization failed.\n"), -1);
-    
+
   rc = this->create_servants ();
   if (rc == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "Create Servants failed.\n"), -1);
-    
+
 
   TAO_TRY
     {
@@ -60,13 +60,13 @@ Cubit_Task::svc (void)
       // Handle requests for this object until we're killed, or one of the
       // methods asks us to exit.
       if (this->orb_->run () == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
-	
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
+
 
       // Shut down the OA.
       this->poa_->destroy (CORBA::B_TRUE,
-			   CORBA::B_TRUE,
-			   TAO_TRY_ENV);
+                           CORBA::B_TRUE,
+                           TAO_TRY_ENV);
       TAO_CHECK_ENV;
     }
   TAO_CATCHANY
@@ -94,63 +94,63 @@ Cubit_Task::initialize_orb (void)
       char **argv = args.argv ();
 
       // Initialize the ORB.
-      this->orb_ = CORBA::ORB_init (argc, 
-				    argv, 
-				    this->orbname_, 
-				    TAO_TRY_ENV);
+      this->orb_ = CORBA::ORB_init (argc,
+                                    argv,
+                                    this->orbname_,
+                                    TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       // Initialize the Object Adapter
-      CORBA::Object_var poa_object = 
-	this->orb_->resolve_initial_references("RootPOA");
+      CORBA::Object_var poa_object =
+        this->orb_->resolve_initial_references("RootPOA");
       if (CORBA::is_nil (poa_object.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
 
       this->root_poa_ =
-	PortableServer::POA::_narrow (poa_object.in(), TAO_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in(), TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       this->poa_manager_ =
-	this->root_poa_->the_POAManager (TAO_TRY_ENV);
+        this->root_poa_->the_POAManager (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       PortableServer::PolicyList policies (2);
-      policies.length (2);  
+      policies.length (2);
       policies[0] =
-	this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
-						      TAO_TRY_ENV);
+        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
+                                                      TAO_TRY_ENV);
       policies[1] =
-	this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-						 TAO_TRY_ENV);
+        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
+                                                 TAO_TRY_ENV);
 
       // We use a different POA, otherwise the user would have to
       // change the object key each time it invokes the server.
       this->poa_ =
-	this->root_poa_->create_POA ("Persistent_POA",
-				     this->poa_manager_.in (),
-				     policies,
-				     TAO_TRY_ENV);  
+        this->root_poa_->create_POA ("Persistent_POA",
+                                     this->poa_manager_.in (),
+                                     policies,
+                                     TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      CORBA::Object_var naming_obj = 
-      	this->orb_->resolve_initial_references ("NameService");
+      CORBA::Object_var naming_obj =
+        this->orb_->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to resolve the Name Service.\n"),
-			  1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to resolve the Name Service.\n"),
+                          1);
 
-      this->naming_context_ = 
+      this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
 
       // Check the environment and return 1 if exception occurred or nil pointer.
-      if (TAO_TRY_ENV.exception () != 0 || 
-	  CORBA::is_nil (this->naming_context_.in ())==CORBA::B_TRUE )
-	{
-	  return 1;
-	}
-	
+      if (TAO_TRY_ENV.exception () != 0 ||
+          CORBA::is_nil (this->naming_context_.in ())==CORBA::B_TRUE )
+        {
+          return 1;
+        }
+
       // Register the servant with the Naming Context....
       CosNaming::Name cubit_context_name (1);
       cubit_context_name.length (1);
@@ -158,31 +158,31 @@ Cubit_Task::initialize_orb (void)
 
       TAO_TRY_ENV.clear ();
       CORBA::Object_var objref =
-	this->naming_context_->bind_new_context (cubit_context_name, TAO_TRY_ENV);
+        this->naming_context_->bind_new_context (cubit_context_name, TAO_TRY_ENV);
 
       if (TAO_TRY_ENV.exception() != 0)
-	{
+        {
 #if 0  // un comment when Andy fixes exception marshalling bug.
-	  CosNaming::NamingContext::AlreadyBound_ptr ex = 
-	    CosNaming::NamingContext::AlreadyBound::_narrow (TAO_TRY_ENV.exception());
-	  if (ex != 0)
-	    {
-	      TAO_TRY_ENV.clear ();
-	      objref = this->naming_context_->resolve (cubit_context_name, 
-						       TAO_TRY_ENV);
-	    }	      
-	  else
-	    TAO_TRY_ENV.print_exception ("bind() Cubit context object\n");
+          CosNaming::NamingContext::AlreadyBound_ptr ex =
+            CosNaming::NamingContext::AlreadyBound::_narrow (TAO_TRY_ENV.exception());
+          if (ex != 0)
+            {
+              TAO_TRY_ENV.clear ();
+              objref = this->naming_context_->resolve (cubit_context_name,
+                                                       TAO_TRY_ENV);
+            }
+          else
+            TAO_TRY_ENV.print_exception ("bind() Cubit context object\n");
 #else
-	      TAO_TRY_ENV.clear ();
-	      objref = this->naming_context_->resolve (cubit_context_name, 
-						       TAO_TRY_ENV);
+              TAO_TRY_ENV.clear ();
+              objref = this->naming_context_->resolve (cubit_context_name,
+                                                       TAO_TRY_ENV);
 #endif /* bug */
-	}
+        }
       TAO_CHECK_ENV;
 
-      this->mt_cubit_context_ = 
-	CosNaming::NamingContext::_narrow (objref.in (), TAO_TRY_ENV);
+      this->mt_cubit_context_ =
+        CosNaming::NamingContext::_narrow (objref.in (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
     }
   TAO_CATCHANY
@@ -191,18 +191,18 @@ Cubit_Task::initialize_orb (void)
       return -1;
     }
   TAO_ENDTRY;
-  
+
   return 0;
 }
 
-CORBA::String 
+CORBA::String
 Cubit_Task::get_servant_ior (u_int index)
 {
   if (index >= num_of_objs_)
     return 0;
 
   return ACE_OS::strdup (this->servants_iors_[index]);
-} 
+}
 
 int
 Cubit_Task::create_servants ()
@@ -211,13 +211,13 @@ Cubit_Task::create_servants ()
     {
       // create the array of cubit implementations
       ACE_NEW_RETURN (servants_,
-		      Cubit_i *[num_of_objs_],
-		      -1);
+                      Cubit_i *[num_of_objs_],
+                      -1);
 
       // create the array of strings.
       ACE_NEW_RETURN (servants_iors_,
-		      CORBA::String [num_of_objs_],
-		      -1);
+                      CORBA::String [num_of_objs_],
+                      -1);
 
       char* buffer;
       int l = ACE_OS::strlen (key) + 3;
@@ -225,62 +225,62 @@ Cubit_Task::create_servants ()
 
       // This loop creates multiple servants, and prints out their IORs
       for (u_int i = 0;
-	   i < num_of_objs_;
-	   i++)
-	{
-	  ACE_OS::sprintf (buffer, "%s%02d",
-			   (char *) key, task_id_);
-
-	  PortableServer::ObjectId_var id = 
-	    PortableServer::string_to_ObjectId (buffer);
-
-	  ACE_NEW_RETURN (this->servants_[i], Cubit_i, -1);
-
-	  if (this->servants_[i] == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       " (%P|%t) Unable to create "
-			       "implementation object #%d\n",
-			       i), 2);
-
-	  this->poa_->activate_object_with_id (id.in (),
-					       this->servants_[i],
-					       TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-
-	  // Stringify the objref we'll be implementing, and print it
-	  // to stdout.  Someone will take that string and give it to
-	  // some client.  Then release the object.
-
-	  Cubit_var cubit = 
-	    this->servants_[i]->_this (TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-
-	  CORBA::String_var str =
-	    this->orb_->object_to_string (cubit.in (), TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-
-	  this->servants_iors_[i] = ACE_OS::strdup (str.in ());
-
-	  // Register the servant with the Naming Context....
-	  CosNaming::Name cubit_name (1);
-	  cubit_name.length (1);
-	  cubit_name[0].id = CORBA::string_dup (buffer);
-
-	  if (!CORBA::is_nil (this->mt_cubit_context_.in ()))
-	    {
-	      this->mt_cubit_context_->bind (cubit_name, 
-					     cubit.in (), 
-					     TAO_TRY_ENV);
-	      if (TAO_TRY_ENV.exception () != 0)
-		TAO_TRY_ENV.print_exception ("Attempt to bind() a cubit object to the name service Failed!\n");
-	      else
-		ACE_DEBUG ((LM_DEBUG, " (%t) Cubit object bound to the name \"%s\".\n", buffer));
-	    }
-
-	  ACE_DEBUG ((LM_DEBUG,
-		      " (%t) Object <%s> created\n",
-		      this->servants_iors_[i]));
-	}
+           i < num_of_objs_;
+           i++)
+        {
+          ACE_OS::sprintf (buffer, "%s%02d",
+                           (char *) key, task_id_);
+
+          PortableServer::ObjectId_var id =
+            PortableServer::string_to_ObjectId (buffer);
+
+          ACE_NEW_RETURN (this->servants_[i], Cubit_i, -1);
+
+          if (this->servants_[i] == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               " (%P|%t) Unable to create "
+                               "implementation object #%d\n",
+                               i), 2);
+
+          this->poa_->activate_object_with_id (id.in (),
+                                               this->servants_[i],
+                                               TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          // Stringify the objref we'll be implementing, and print it
+          // to stdout.  Someone will take that string and give it to
+          // some client.  Then release the object.
+
+          Cubit_var cubit =
+            this->servants_[i]->_this (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          CORBA::String_var str =
+            this->orb_->object_to_string (cubit.in (), TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          this->servants_iors_[i] = ACE_OS::strdup (str.in ());
+
+          // Register the servant with the Naming Context....
+          CosNaming::Name cubit_name (1);
+          cubit_name.length (1);
+          cubit_name[0].id = CORBA::string_dup (buffer);
+
+          if (!CORBA::is_nil (this->mt_cubit_context_.in ()))
+            {
+              this->mt_cubit_context_->bind (cubit_name,
+                                             cubit.in (),
+                                             TAO_TRY_ENV);
+              if (TAO_TRY_ENV.exception () != 0)
+                TAO_TRY_ENV.print_exception ("Attempt to bind() a cubit object to the name service Failed!\n");
+              else
+                ACE_DEBUG ((LM_DEBUG, " (%t) Cubit object bound to the name \"%s\".\n", buffer));
+            }
+
+          ACE_DEBUG ((LM_DEBUG,
+                      " (%t) Object <%s> created\n",
+                      this->servants_iors_[i]));
+        }
 
       delete[] buffer;
 
@@ -300,9 +300,9 @@ Cubit_Factory_Task::Cubit_Factory_Task (void)
 }
 
 Cubit_Factory_Task::Cubit_Factory_Task (const char *args,
-					const char *orbname,
-					CORBA::String * cubits,
-					u_int num_of_objs)
+                                        const char *orbname,
+                                        CORBA::String * cubits,
+                                        u_int num_of_objs)
   : orbname_ ((char *) orbname),
     orbargs_ ((char *) args),
     cubits_ (cubits),
@@ -315,35 +315,35 @@ int
 Cubit_Factory_Task::create_factory (void)
 {
   TAO_TRY
-    {      
+    {
       // Create implementation object with user specified key.
       ACE_NEW_RETURN (this->cubit_factory_,
-		      Cubit_Factory_i (cubits_, num_of_objs_),
-		      -1);
+                      Cubit_Factory_i (cubits_, num_of_objs_),
+                      -1);
+
+      PortableServer::ObjectId_var id =
+        PortableServer::string_to_ObjectId ("Cubit_Factory");
 
-      PortableServer::ObjectId_var id = 
-	PortableServer::string_to_ObjectId ("Cubit_Factory");
-      
       this->poa_->activate_object_with_id (id.in (),
-					   this->cubit_factory_,
-					   TAO_TRY_ENV);
+                                           this->cubit_factory_,
+                                           TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-	  // Stringify the objref we'll be implementing, and print it
-	  // to stdout.  Someone will take that string and give it to
-	  // some client.  Then release the object.
+          // Stringify the objref we'll be implementing, and print it
+          // to stdout.  Someone will take that string and give it to
+          // some client.  Then release the object.
 
-      Cubit_Factory_var cubit_factory = 
-	this->cubit_factory_->_this (TAO_TRY_ENV);
+      Cubit_Factory_var cubit_factory =
+        this->cubit_factory_->_this (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       CORBA::String_var str =
-	this->orb_->object_to_string (cubit_factory.in (), TAO_TRY_ENV);
+        this->orb_->object_to_string (cubit_factory.in (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
-	  
+
       ACE_DEBUG ((LM_DEBUG,
-		  ">>> (%P|%t) Cubit Factory Object created with IOR <%s>\n",
-		  str.in ()));
+                  ">>> (%P|%t) Cubit Factory Object created with IOR <%s>\n",
+                  str.in ()));
     }
   TAO_CATCHANY
     {
@@ -372,13 +372,13 @@ Cubit_Factory_Task::svc (void)
       // Handle requests for this object until we're killed, or one of the
       // methods asks us to exit.
       if (this->orb_->run () == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
-	
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
+
 
       // Shut down the OA.
       this->poa_->destroy (CORBA::B_TRUE,
-			   CORBA::B_TRUE,
-			   TAO_TRY_ENV);
+                           CORBA::B_TRUE,
+                           TAO_TRY_ENV);
       TAO_CHECK_ENV;
     }
   TAO_CATCHANY
@@ -401,44 +401,44 @@ Cubit_Factory_Task::initialize_orb (void)
       char **argv = args.argv ();
 
       // Initialize the ORB.
-      this->orb_ = CORBA::ORB_init (argc, 
-				    argv, 
-				    this->orbname_, 
-				    TAO_TRY_ENV);
+      this->orb_ = CORBA::ORB_init (argc,
+                                    argv,
+                                    this->orbname_,
+                                    TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       // Initialize the Object Adapter
-      CORBA::Object_var poa_object = 
-	this->orb_->resolve_initial_references("RootPOA");
+      CORBA::Object_var poa_object =
+        this->orb_->resolve_initial_references("RootPOA");
       if (CORBA::is_nil (poa_object.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
 
       this->root_poa_ =
-	PortableServer::POA::_narrow (poa_object.in(), TAO_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in(), TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       this->poa_manager_ =
-	this->root_poa_->the_POAManager (TAO_TRY_ENV);
+        this->root_poa_->the_POAManager (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       PortableServer::PolicyList policies (2);
-      policies.length (2);  
+      policies.length (2);
       policies[0] =
-	this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
-						      TAO_TRY_ENV);
+        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
+                                                      TAO_TRY_ENV);
       policies[1] =
-	this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-						 TAO_TRY_ENV);
+        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
+                                                 TAO_TRY_ENV);
 
       // We use a different POA, otherwise the user would have to
       // change the object key each time it invokes the server.
       this->poa_ =
-	this->root_poa_->create_POA ("Persistent_POA",
-				     this->poa_manager_.in (),
-				     policies,
-				     TAO_TRY_ENV);  
+        this->root_poa_->create_POA ("Persistent_POA",
+                                     this->poa_manager_.in (),
+                                     policies,
+                                     TAO_TRY_ENV);
       TAO_CHECK_ENV;
     }
   TAO_CATCHANY
@@ -447,7 +447,7 @@ Cubit_Factory_Task::initialize_orb (void)
       return -1;
     }
   TAO_ENDTRY;
-  
+
   return 0;
 }
 
@@ -469,28 +469,28 @@ parse_args (int argc, char *argv[])
       {
       case 'h':
         hostname = opts.optarg;
-	ACE_DEBUG ((LM_DEBUG, "h\n"));
+        ACE_DEBUG ((LM_DEBUG, "h\n"));
         break;
       case 'p':
-	base_port = ACE_OS::atoi (opts.optarg);
-	ACE_DEBUG ((LM_DEBUG, "p\n"));
-	break;
+        base_port = ACE_OS::atoi (opts.optarg);
+        ACE_DEBUG ((LM_DEBUG, "p\n"));
+        break;
       case 't':
-	num_of_objs = ACE_OS::atoi (opts.optarg);
-	break;
+        num_of_objs = ACE_OS::atoi (opts.optarg);
+        break;
       case '?':
       default:
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "usage:  %s"
-			   " -p port"
-			   " -h my_hostname"
-			   " -t num_objects"
-			   "\n", argv [0]),
-			  1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s"
+                           " -p port"
+                           " -h my_hostname"
+                           " -t num_objects"
+                           "\n", argv [0]),
+                          1);
       }
 
   // Indicates successful parsing of command line
-  return 0;  
+  return 0;
 }
 
 int
@@ -514,7 +514,7 @@ initialize (int argc, char **argv)
                     "10014",
                     "-h",
                     "130.38.183.132" };
-   
+
 #endif /* defined (FORCE_ARGS) */
 #endif /* defined (VXWORKS) */
 
@@ -523,12 +523,12 @@ initialize (int argc, char **argv)
 
    if (hostname == 0 || base_port == 0)
      ACE_ERROR_RETURN ((LM_ERROR,
-			"usage:  %s"
-			" -p port"
-			" -h my_hostname"
-			" -t num_objects"
-			"\n", argv [0]),
-		       1);
+                        "usage:  %s"
+                        " -p port"
+                        " -h my_hostname"
+                        " -t num_objects"
+                        "\n", argv [0]),
+                       1);
 
    // Make sure we've got plenty of socket handles.  This call will use
    // the default maximum.
@@ -542,6 +542,7 @@ int
 start_servants ()
 {
   char *args1 = new char [4096];
+  int i;
 
   ACE_Barrier barrier_ (num_of_objs + 1);
   // Barrier for the multiple clients to synchronize after
@@ -551,21 +552,21 @@ start_servants ()
   CORBA::String *cubits;
 
   ACE_NEW_RETURN (cubits,
-		  CORBA::String [num_of_objs],
-		  -1);
-  
+                  CORBA::String [num_of_objs],
+                  -1);
+
   ACE_OS::sprintf (args1,
                    "rate20 -ORBport %d -ORBhost %s -ORBobjrefstyle URL ",
-                   base_port, 
+                   base_port,
                    hostname);
 
   Cubit_Task *high_priority_task;
-  ACE_NEW_RETURN (high_priority_task, 
+  ACE_NEW_RETURN (high_priority_task,
                   Cubit_Task (args1,
                               "internet",
                               1,
-			      &barrier_,
-			      0), //task id 0.
+                              &barrier_,
+                              0), //task id 0.
                   -1);
 
   ACE_Sched_Priority priority;
@@ -583,33 +584,33 @@ start_servants ()
               "Creating servant with high priority\n"));
 
   // Make the high priority task an active object.
-  high_priority_task->activate (THR_BOUND | ACE_SCHED_FIFO, 
-                               1, 
-                               0, 
+  high_priority_task->activate (THR_BOUND | ACE_SCHED_FIFO,
+                               1,
+                               0,
                                priority);
 
   // Create an array to hold pointers to the low priority tasks..
   Cubit_Task **low_priority_task;
 
-  ACE_NEW_RETURN (low_priority_task, 
-                  Cubit_Task *[num_of_objs], 
+  ACE_NEW_RETURN (low_priority_task,
+                  Cubit_Task *[num_of_objs],
                   -1);
 
   priority = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
                                                   priority,
                                                   ACE_SCOPE_THREAD);
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "Creating %d servants with low priority\n",
               num_of_objs - 1));
 
   // Create the low priority servants.
-  for (int i = 0; i < num_of_objs - 1; i++)
+  for (i = 0; i < num_of_objs - 1; i++)
     {
       char * args = new char [4096];
 
-      ACE_OS::sprintf (args, 
-                       "rate10 -ORBport %d -ORBhost %s -ORBobjrefstyle URL ", 
+      ACE_OS::sprintf (args,
+                       "rate10 -ORBport %d -ORBhost %s -ORBobjrefstyle URL ",
                        base_port + 1 + i,
                        hostname);
 
@@ -622,18 +623,18 @@ start_servants ()
                                                   ACE_SCOPE_THREAD);
 
       // Make the low priority task an active object.
-      low_priority_task [i]->activate (THR_BOUND | ACE_SCHED_FIFO, 
-                                       1, 
-                                       0, 
+      low_priority_task [i]->activate (THR_BOUND | ACE_SCHED_FIFO,
+                                       1,
+                                       0,
                                        priority);
     }
 
   char * args = new char [4096];
 
-  ACE_OS::sprintf (args, 
-		   "rate10 -ORBport %d -ORBhost %s -ORBobjrefstyle URL ", 
-		   base_port + num_of_objs,
-		   hostname);
+  ACE_OS::sprintf (args,
+                   "rate10 -ORBport %d -ORBhost %s -ORBobjrefstyle URL ",
+                   base_port + num_of_objs,
+                   hostname);
 
   Cubit_Factory_Task * factory_task;
 
@@ -648,20 +649,20 @@ start_servants ()
     printf ("cubits[%d] ior = %s\n", i, cubits[i]);
 
 
-                    
+
   ACE_NEW_RETURN (factory_task,
-		  Cubit_Factory_Task (args, "internet", cubits, num_of_objs),
-		  -1);  
-  
+                  Cubit_Factory_Task (args, "internet", cubits, num_of_objs),
+                  -1);
+
   priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-					      priority,
-					      ACE_SCOPE_THREAD);
-  
+                                              priority,
+                                              ACE_SCOPE_THREAD);
+
   //  Make the factory low priority task an active object.
-  factory_task->activate (THR_BOUND | ACE_SCHED_FIFO, 
-			  1, 
-			  0, 
-			  priority);
+  factory_task->activate (THR_BOUND | ACE_SCHED_FIFO,
+                          1,
+                          0,
+                          priority);
   return 0;
 }
 
@@ -681,4 +682,3 @@ main (int argc, char *argv[])
   ACE_Thread_Manager::instance ()->wait ();
   return 0;
 }
-
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/tests/Cubit/TAO/MT_Cubit/server.cpp
index bcb675e3b90..5a358f414e2 100644
--- a/TAO/tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -23,8 +23,8 @@ Cubit_Task::Cubit_Task (void)
 Cubit_Task::Cubit_Task (const char *args,
                         const char *orbname,
                         u_int num_of_objs,
-			ACE_Barrier *barrier,
-			u_int task_id)
+                        ACE_Barrier *barrier,
+                        u_int task_id)
   : orbname_ ((char *) orbname),
     orbargs_ ((char *) args),
     num_of_objs_ (num_of_objs),
@@ -44,11 +44,11 @@ Cubit_Task::svc (void)
   int rc = this->initialize_orb ();
   if (rc == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "ORB initialization failed.\n"), -1);
-    
+
   rc = this->create_servants ();
   if (rc == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "Create Servants failed.\n"), -1);
-    
+
 
   TAO_TRY
     {
@@ -60,13 +60,13 @@ Cubit_Task::svc (void)
       // Handle requests for this object until we're killed, or one of the
       // methods asks us to exit.
       if (this->orb_->run () == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
-	
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
+
 
       // Shut down the OA.
       this->poa_->destroy (CORBA::B_TRUE,
-			   CORBA::B_TRUE,
-			   TAO_TRY_ENV);
+                           CORBA::B_TRUE,
+                           TAO_TRY_ENV);
       TAO_CHECK_ENV;
     }
   TAO_CATCHANY
@@ -94,63 +94,63 @@ Cubit_Task::initialize_orb (void)
       char **argv = args.argv ();
 
       // Initialize the ORB.
-      this->orb_ = CORBA::ORB_init (argc, 
-				    argv, 
-				    this->orbname_, 
-				    TAO_TRY_ENV);
+      this->orb_ = CORBA::ORB_init (argc,
+                                    argv,
+                                    this->orbname_,
+                                    TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       // Initialize the Object Adapter
-      CORBA::Object_var poa_object = 
-	this->orb_->resolve_initial_references("RootPOA");
+      CORBA::Object_var poa_object =
+        this->orb_->resolve_initial_references("RootPOA");
       if (CORBA::is_nil (poa_object.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
 
       this->root_poa_ =
-	PortableServer::POA::_narrow (poa_object.in(), TAO_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in(), TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       this->poa_manager_ =
-	this->root_poa_->the_POAManager (TAO_TRY_ENV);
+        this->root_poa_->the_POAManager (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       PortableServer::PolicyList policies (2);
-      policies.length (2);  
+      policies.length (2);
       policies[0] =
-	this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
-						      TAO_TRY_ENV);
+        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
+                                                      TAO_TRY_ENV);
       policies[1] =
-	this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-						 TAO_TRY_ENV);
+        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
+                                                 TAO_TRY_ENV);
 
       // We use a different POA, otherwise the user would have to
       // change the object key each time it invokes the server.
       this->poa_ =
-	this->root_poa_->create_POA ("Persistent_POA",
-				     this->poa_manager_.in (),
-				     policies,
-				     TAO_TRY_ENV);  
+        this->root_poa_->create_POA ("Persistent_POA",
+                                     this->poa_manager_.in (),
+                                     policies,
+                                     TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      CORBA::Object_var naming_obj = 
-      	this->orb_->resolve_initial_references ("NameService");
+      CORBA::Object_var naming_obj =
+        this->orb_->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to resolve the Name Service.\n"),
-			  1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to resolve the Name Service.\n"),
+                          1);
 
-      this->naming_context_ = 
+      this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
 
       // Check the environment and return 1 if exception occurred or nil pointer.
-      if (TAO_TRY_ENV.exception () != 0 || 
-	  CORBA::is_nil (this->naming_context_.in ())==CORBA::B_TRUE )
-	{
-	  return 1;
-	}
-	
+      if (TAO_TRY_ENV.exception () != 0 ||
+          CORBA::is_nil (this->naming_context_.in ())==CORBA::B_TRUE )
+        {
+          return 1;
+        }
+
       // Register the servant with the Naming Context....
       CosNaming::Name cubit_context_name (1);
       cubit_context_name.length (1);
@@ -158,31 +158,31 @@ Cubit_Task::initialize_orb (void)
 
       TAO_TRY_ENV.clear ();
       CORBA::Object_var objref =
-	this->naming_context_->bind_new_context (cubit_context_name, TAO_TRY_ENV);
+        this->naming_context_->bind_new_context (cubit_context_name, TAO_TRY_ENV);
 
       if (TAO_TRY_ENV.exception() != 0)
-	{
+        {
 #if 0  // un comment when Andy fixes exception marshalling bug.
-	  CosNaming::NamingContext::AlreadyBound_ptr ex = 
-	    CosNaming::NamingContext::AlreadyBound::_narrow (TAO_TRY_ENV.exception());
-	  if (ex != 0)
-	    {
-	      TAO_TRY_ENV.clear ();
-	      objref = this->naming_context_->resolve (cubit_context_name, 
-						       TAO_TRY_ENV);
-	    }	      
-	  else
-	    TAO_TRY_ENV.print_exception ("bind() Cubit context object\n");
+          CosNaming::NamingContext::AlreadyBound_ptr ex =
+            CosNaming::NamingContext::AlreadyBound::_narrow (TAO_TRY_ENV.exception());
+          if (ex != 0)
+            {
+              TAO_TRY_ENV.clear ();
+              objref = this->naming_context_->resolve (cubit_context_name,
+                                                       TAO_TRY_ENV);
+            }
+          else
+            TAO_TRY_ENV.print_exception ("bind() Cubit context object\n");
 #else
-	      TAO_TRY_ENV.clear ();
-	      objref = this->naming_context_->resolve (cubit_context_name, 
-						       TAO_TRY_ENV);
+              TAO_TRY_ENV.clear ();
+              objref = this->naming_context_->resolve (cubit_context_name,
+                                                       TAO_TRY_ENV);
 #endif /* bug */
-	}
+        }
       TAO_CHECK_ENV;
 
-      this->mt_cubit_context_ = 
-	CosNaming::NamingContext::_narrow (objref.in (), TAO_TRY_ENV);
+      this->mt_cubit_context_ =
+        CosNaming::NamingContext::_narrow (objref.in (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
     }
   TAO_CATCHANY
@@ -191,18 +191,18 @@ Cubit_Task::initialize_orb (void)
       return -1;
     }
   TAO_ENDTRY;
-  
+
   return 0;
 }
 
-CORBA::String 
+CORBA::String
 Cubit_Task::get_servant_ior (u_int index)
 {
   if (index >= num_of_objs_)
     return 0;
 
   return ACE_OS::strdup (this->servants_iors_[index]);
-} 
+}
 
 int
 Cubit_Task::create_servants ()
@@ -211,13 +211,13 @@ Cubit_Task::create_servants ()
     {
       // create the array of cubit implementations
       ACE_NEW_RETURN (servants_,
-		      Cubit_i *[num_of_objs_],
-		      -1);
+                      Cubit_i *[num_of_objs_],
+                      -1);
 
       // create the array of strings.
       ACE_NEW_RETURN (servants_iors_,
-		      CORBA::String [num_of_objs_],
-		      -1);
+                      CORBA::String [num_of_objs_],
+                      -1);
 
       char* buffer;
       int l = ACE_OS::strlen (key) + 3;
@@ -225,62 +225,62 @@ Cubit_Task::create_servants ()
 
       // This loop creates multiple servants, and prints out their IORs
       for (u_int i = 0;
-	   i < num_of_objs_;
-	   i++)
-	{
-	  ACE_OS::sprintf (buffer, "%s%02d",
-			   (char *) key, task_id_);
-
-	  PortableServer::ObjectId_var id = 
-	    PortableServer::string_to_ObjectId (buffer);
-
-	  ACE_NEW_RETURN (this->servants_[i], Cubit_i, -1);
-
-	  if (this->servants_[i] == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       " (%P|%t) Unable to create "
-			       "implementation object #%d\n",
-			       i), 2);
-
-	  this->poa_->activate_object_with_id (id.in (),
-					       this->servants_[i],
-					       TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-
-	  // Stringify the objref we'll be implementing, and print it
-	  // to stdout.  Someone will take that string and give it to
-	  // some client.  Then release the object.
-
-	  Cubit_var cubit = 
-	    this->servants_[i]->_this (TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-
-	  CORBA::String_var str =
-	    this->orb_->object_to_string (cubit.in (), TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-
-	  this->servants_iors_[i] = ACE_OS::strdup (str.in ());
-
-	  // Register the servant with the Naming Context....
-	  CosNaming::Name cubit_name (1);
-	  cubit_name.length (1);
-	  cubit_name[0].id = CORBA::string_dup (buffer);
-
-	  if (!CORBA::is_nil (this->mt_cubit_context_.in ()))
-	    {
-	      this->mt_cubit_context_->bind (cubit_name, 
-					     cubit.in (), 
-					     TAO_TRY_ENV);
-	      if (TAO_TRY_ENV.exception () != 0)
-		TAO_TRY_ENV.print_exception ("Attempt to bind() a cubit object to the name service Failed!\n");
-	      else
-		ACE_DEBUG ((LM_DEBUG, " (%t) Cubit object bound to the name \"%s\".\n", buffer));
-	    }
-
-	  ACE_DEBUG ((LM_DEBUG,
-		      " (%t) Object <%s> created\n",
-		      this->servants_iors_[i]));
-	}
+           i < num_of_objs_;
+           i++)
+        {
+          ACE_OS::sprintf (buffer, "%s%02d",
+                           (char *) key, task_id_);
+
+          PortableServer::ObjectId_var id =
+            PortableServer::string_to_ObjectId (buffer);
+
+          ACE_NEW_RETURN (this->servants_[i], Cubit_i, -1);
+
+          if (this->servants_[i] == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               " (%P|%t) Unable to create "
+                               "implementation object #%d\n",
+                               i), 2);
+
+          this->poa_->activate_object_with_id (id.in (),
+                                               this->servants_[i],
+                                               TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          // Stringify the objref we'll be implementing, and print it
+          // to stdout.  Someone will take that string and give it to
+          // some client.  Then release the object.
+
+          Cubit_var cubit =
+            this->servants_[i]->_this (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          CORBA::String_var str =
+            this->orb_->object_to_string (cubit.in (), TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          this->servants_iors_[i] = ACE_OS::strdup (str.in ());
+
+          // Register the servant with the Naming Context....
+          CosNaming::Name cubit_name (1);
+          cubit_name.length (1);
+          cubit_name[0].id = CORBA::string_dup (buffer);
+
+          if (!CORBA::is_nil (this->mt_cubit_context_.in ()))
+            {
+              this->mt_cubit_context_->bind (cubit_name,
+                                             cubit.in (),
+                                             TAO_TRY_ENV);
+              if (TAO_TRY_ENV.exception () != 0)
+                TAO_TRY_ENV.print_exception ("Attempt to bind() a cubit object to the name service Failed!\n");
+              else
+                ACE_DEBUG ((LM_DEBUG, " (%t) Cubit object bound to the name \"%s\".\n", buffer));
+            }
+
+          ACE_DEBUG ((LM_DEBUG,
+                      " (%t) Object <%s> created\n",
+                      this->servants_iors_[i]));
+        }
 
       delete[] buffer;
 
@@ -300,9 +300,9 @@ Cubit_Factory_Task::Cubit_Factory_Task (void)
 }
 
 Cubit_Factory_Task::Cubit_Factory_Task (const char *args,
-					const char *orbname,
-					CORBA::String * cubits,
-					u_int num_of_objs)
+                                        const char *orbname,
+                                        CORBA::String * cubits,
+                                        u_int num_of_objs)
   : orbname_ ((char *) orbname),
     orbargs_ ((char *) args),
     cubits_ (cubits),
@@ -315,35 +315,35 @@ int
 Cubit_Factory_Task::create_factory (void)
 {
   TAO_TRY
-    {      
+    {
       // Create implementation object with user specified key.
       ACE_NEW_RETURN (this->cubit_factory_,
-		      Cubit_Factory_i (cubits_, num_of_objs_),
-		      -1);
+                      Cubit_Factory_i (cubits_, num_of_objs_),
+                      -1);
+
+      PortableServer::ObjectId_var id =
+        PortableServer::string_to_ObjectId ("Cubit_Factory");
 
-      PortableServer::ObjectId_var id = 
-	PortableServer::string_to_ObjectId ("Cubit_Factory");
-      
       this->poa_->activate_object_with_id (id.in (),
-					   this->cubit_factory_,
-					   TAO_TRY_ENV);
+                                           this->cubit_factory_,
+                                           TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-	  // Stringify the objref we'll be implementing, and print it
-	  // to stdout.  Someone will take that string and give it to
-	  // some client.  Then release the object.
+          // Stringify the objref we'll be implementing, and print it
+          // to stdout.  Someone will take that string and give it to
+          // some client.  Then release the object.
 
-      Cubit_Factory_var cubit_factory = 
-	this->cubit_factory_->_this (TAO_TRY_ENV);
+      Cubit_Factory_var cubit_factory =
+        this->cubit_factory_->_this (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       CORBA::String_var str =
-	this->orb_->object_to_string (cubit_factory.in (), TAO_TRY_ENV);
+        this->orb_->object_to_string (cubit_factory.in (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
-	  
+
       ACE_DEBUG ((LM_DEBUG,
-		  ">>> (%P|%t) Cubit Factory Object created with IOR <%s>\n",
-		  str.in ()));
+                  ">>> (%P|%t) Cubit Factory Object created with IOR <%s>\n",
+                  str.in ()));
     }
   TAO_CATCHANY
     {
@@ -372,13 +372,13 @@ Cubit_Factory_Task::svc (void)
       // Handle requests for this object until we're killed, or one of the
       // methods asks us to exit.
       if (this->orb_->run () == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
-	
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
+
 
       // Shut down the OA.
       this->poa_->destroy (CORBA::B_TRUE,
-			   CORBA::B_TRUE,
-			   TAO_TRY_ENV);
+                           CORBA::B_TRUE,
+                           TAO_TRY_ENV);
       TAO_CHECK_ENV;
     }
   TAO_CATCHANY
@@ -401,44 +401,44 @@ Cubit_Factory_Task::initialize_orb (void)
       char **argv = args.argv ();
 
       // Initialize the ORB.
-      this->orb_ = CORBA::ORB_init (argc, 
-				    argv, 
-				    this->orbname_, 
-				    TAO_TRY_ENV);
+      this->orb_ = CORBA::ORB_init (argc,
+                                    argv,
+                                    this->orbname_,
+                                    TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       // Initialize the Object Adapter
-      CORBA::Object_var poa_object = 
-	this->orb_->resolve_initial_references("RootPOA");
+      CORBA::Object_var poa_object =
+        this->orb_->resolve_initial_references("RootPOA");
       if (CORBA::is_nil (poa_object.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
 
       this->root_poa_ =
-	PortableServer::POA::_narrow (poa_object.in(), TAO_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in(), TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       this->poa_manager_ =
-	this->root_poa_->the_POAManager (TAO_TRY_ENV);
+        this->root_poa_->the_POAManager (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       PortableServer::PolicyList policies (2);
-      policies.length (2);  
+      policies.length (2);
       policies[0] =
-	this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
-						      TAO_TRY_ENV);
+        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
+                                                      TAO_TRY_ENV);
       policies[1] =
-	this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-						 TAO_TRY_ENV);
+        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
+                                                 TAO_TRY_ENV);
 
       // We use a different POA, otherwise the user would have to
       // change the object key each time it invokes the server.
       this->poa_ =
-	this->root_poa_->create_POA ("Persistent_POA",
-				     this->poa_manager_.in (),
-				     policies,
-				     TAO_TRY_ENV);  
+        this->root_poa_->create_POA ("Persistent_POA",
+                                     this->poa_manager_.in (),
+                                     policies,
+                                     TAO_TRY_ENV);
       TAO_CHECK_ENV;
     }
   TAO_CATCHANY
@@ -447,7 +447,7 @@ Cubit_Factory_Task::initialize_orb (void)
       return -1;
     }
   TAO_ENDTRY;
-  
+
   return 0;
 }
 
@@ -469,28 +469,28 @@ parse_args (int argc, char *argv[])
       {
       case 'h':
         hostname = opts.optarg;
-	ACE_DEBUG ((LM_DEBUG, "h\n"));
+        ACE_DEBUG ((LM_DEBUG, "h\n"));
         break;
       case 'p':
-	base_port = ACE_OS::atoi (opts.optarg);
-	ACE_DEBUG ((LM_DEBUG, "p\n"));
-	break;
+        base_port = ACE_OS::atoi (opts.optarg);
+        ACE_DEBUG ((LM_DEBUG, "p\n"));
+        break;
       case 't':
-	num_of_objs = ACE_OS::atoi (opts.optarg);
-	break;
+        num_of_objs = ACE_OS::atoi (opts.optarg);
+        break;
       case '?':
       default:
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "usage:  %s"
-			   " -p port"
-			   " -h my_hostname"
-			   " -t num_objects"
-			   "\n", argv [0]),
-			  1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s"
+                           " -p port"
+                           " -h my_hostname"
+                           " -t num_objects"
+                           "\n", argv [0]),
+                          1);
       }
 
   // Indicates successful parsing of command line
-  return 0;  
+  return 0;
 }
 
 int
@@ -514,7 +514,7 @@ initialize (int argc, char **argv)
                     "10014",
                     "-h",
                     "130.38.183.132" };
-   
+
 #endif /* defined (FORCE_ARGS) */
 #endif /* defined (VXWORKS) */
 
@@ -523,12 +523,12 @@ initialize (int argc, char **argv)
 
    if (hostname == 0 || base_port == 0)
      ACE_ERROR_RETURN ((LM_ERROR,
-			"usage:  %s"
-			" -p port"
-			" -h my_hostname"
-			" -t num_objects"
-			"\n", argv [0]),
-		       1);
+                        "usage:  %s"
+                        " -p port"
+                        " -h my_hostname"
+                        " -t num_objects"
+                        "\n", argv [0]),
+                       1);
 
    // Make sure we've got plenty of socket handles.  This call will use
    // the default maximum.
@@ -542,6 +542,7 @@ int
 start_servants ()
 {
   char *args1 = new char [4096];
+  int i;
 
   ACE_Barrier barrier_ (num_of_objs + 1);
   // Barrier for the multiple clients to synchronize after
@@ -551,21 +552,21 @@ start_servants ()
   CORBA::String *cubits;
 
   ACE_NEW_RETURN (cubits,
-		  CORBA::String [num_of_objs],
-		  -1);
-  
+                  CORBA::String [num_of_objs],
+                  -1);
+
   ACE_OS::sprintf (args1,
                    "rate20 -ORBport %d -ORBhost %s -ORBobjrefstyle URL ",
-                   base_port, 
+                   base_port,
                    hostname);
 
   Cubit_Task *high_priority_task;
-  ACE_NEW_RETURN (high_priority_task, 
+  ACE_NEW_RETURN (high_priority_task,
                   Cubit_Task (args1,
                               "internet",
                               1,
-			      &barrier_,
-			      0), //task id 0.
+                              &barrier_,
+                              0), //task id 0.
                   -1);
 
   ACE_Sched_Priority priority;
@@ -583,33 +584,33 @@ start_servants ()
               "Creating servant with high priority\n"));
 
   // Make the high priority task an active object.
-  high_priority_task->activate (THR_BOUND | ACE_SCHED_FIFO, 
-                               1, 
-                               0, 
+  high_priority_task->activate (THR_BOUND | ACE_SCHED_FIFO,
+                               1,
+                               0,
                                priority);
 
   // Create an array to hold pointers to the low priority tasks..
   Cubit_Task **low_priority_task;
 
-  ACE_NEW_RETURN (low_priority_task, 
-                  Cubit_Task *[num_of_objs], 
+  ACE_NEW_RETURN (low_priority_task,
+                  Cubit_Task *[num_of_objs],
                   -1);
 
   priority = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
                                                   priority,
                                                   ACE_SCOPE_THREAD);
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "Creating %d servants with low priority\n",
               num_of_objs - 1));
 
   // Create the low priority servants.
-  for (int i = 0; i < num_of_objs - 1; i++)
+  for (i = 0; i < num_of_objs - 1; i++)
     {
       char * args = new char [4096];
 
-      ACE_OS::sprintf (args, 
-                       "rate10 -ORBport %d -ORBhost %s -ORBobjrefstyle URL ", 
+      ACE_OS::sprintf (args,
+                       "rate10 -ORBport %d -ORBhost %s -ORBobjrefstyle URL ",
                        base_port + 1 + i,
                        hostname);
 
@@ -622,18 +623,18 @@ start_servants ()
                                                   ACE_SCOPE_THREAD);
 
       // Make the low priority task an active object.
-      low_priority_task [i]->activate (THR_BOUND | ACE_SCHED_FIFO, 
-                                       1, 
-                                       0, 
+      low_priority_task [i]->activate (THR_BOUND | ACE_SCHED_FIFO,
+                                       1,
+                                       0,
                                        priority);
     }
 
   char * args = new char [4096];
 
-  ACE_OS::sprintf (args, 
-		   "rate10 -ORBport %d -ORBhost %s -ORBobjrefstyle URL ", 
-		   base_port + num_of_objs,
-		   hostname);
+  ACE_OS::sprintf (args,
+                   "rate10 -ORBport %d -ORBhost %s -ORBobjrefstyle URL ",
+                   base_port + num_of_objs,
+                   hostname);
 
   Cubit_Factory_Task * factory_task;
 
@@ -648,20 +649,20 @@ start_servants ()
     printf ("cubits[%d] ior = %s\n", i, cubits[i]);
 
 
-                    
+
   ACE_NEW_RETURN (factory_task,
-		  Cubit_Factory_Task (args, "internet", cubits, num_of_objs),
-		  -1);  
-  
+                  Cubit_Factory_Task (args, "internet", cubits, num_of_objs),
+                  -1);
+
   priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-					      priority,
-					      ACE_SCOPE_THREAD);
-  
+                                              priority,
+                                              ACE_SCOPE_THREAD);
+
   //  Make the factory low priority task an active object.
-  factory_task->activate (THR_BOUND | ACE_SCHED_FIFO, 
-			  1, 
-			  0, 
-			  priority);
+  factory_task->activate (THR_BOUND | ACE_SCHED_FIFO,
+                          1,
+                          0,
+                          priority);
   return 0;
 }
 
@@ -681,4 +682,3 @@ main (int argc, char *argv[])
   ACE_Thread_Manager::instance ()->wait ();
   return 0;
 }
-