Fixed error in exception printout. Fixed comments and general formatting issues.

5 files changed, 56 insertions, 30 deletions

diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog
index cf812af80b4..cf7a19dcaf1 100644
--- a/TAO/OCI_RE_ChangeLog
+++ b/TAO/OCI_RE_ChangeLog
@@ -1,3 +1,18 @@
+Thu Jan 31 14:10:56 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
+
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp:
+
+          Fixed formatting issues. Lines too long.
+
+        * orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp:
+
+          Fixed error in which exception was being printed in catch block.
+
+        * tao/ORB_Core.cpp:
+
+          Fixed copy paste error in comment.
+
 Wed Jan 30 19:03:33 UTC 2013  Byron Harris  <harrisb@ociweb.com>
 
         * docs/Options.html:
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
index fbaced68f6c..d5eb451e92d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
@@ -134,8 +134,8 @@ TAO_FT_Naming_Server::init_with_orb (int argc,
   // references to files.
   if (this->server_role_ == TAO_FT_Naming_Server::BACKUP)
     {
-      // The backup should write out the combined IOR for the primary and backup
-      // naming service and naming manager.
+      // The backup should write out the combined IOR for the primary
+      // and backup naming service and naming manager.
       result = export_ft_naming_references ();
     }
 
@@ -152,8 +152,8 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int argc,
 
   int result = 0;
 
-  // Need to lock during startup to prevent access of partially initialized
-  // variables
+  // Need to lock during startup to prevent access of partially
+  // initialized variables
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
                       this->lock_,
@@ -223,10 +223,12 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int argc,
 
     // Register with the POA.
     PortableServer::ObjectId_var id =
-      PortableServer::string_to_ObjectId (ACE_TEXT_ALWAYS_CHAR ("NamingManager"));
+      PortableServer::string_to_ObjectId (
+         ACE_TEXT_ALWAYS_CHAR ("NamingManager"));
 
-    this->naming_manager_poa_->activate_object_with_id (id.in (),
-                                                        &this->naming_manager_);
+    this->naming_manager_poa_->activate_object_with_id (
+       id.in (),
+       &this->naming_manager_);
 
     CORBA::Object_var nm_obj =
       this->naming_manager_poa_->id_to_reference (id.in ());
@@ -388,16 +390,19 @@ TAO_FT_Naming_Server::init_replication_manager_with_orb (int argc,
       orb->object_to_string (repl_mgr_ref.in ());
 
     // Provide the replication manager its ORB and POA
-    this->replication_manager_->initialize (this->orb_.in (),
-                                            this->replication_manager_poa_.in ());
+    this->replication_manager_->initialize (
+      this->orb_.in (),
+      this->replication_manager_poa_.in ());
 
     ACE_CString primary_file_name (this->persistence_file_name_);
     primary_file_name += ACE_TEXT ("/");
-    primary_file_name += TAO_FT_Naming_Server::primary_replica_ior_filename;
+    primary_file_name +=
+      TAO_FT_Naming_Server::primary_replica_ior_filename;
 
     ACE_CString backup_file_name (this->persistence_file_name_);
     backup_file_name += ACE_TEXT ("/");
-    backup_file_name += TAO_FT_Naming_Server::backup_replica_ior_filename;
+    backup_file_name +=
+      TAO_FT_Naming_Server::backup_replica_ior_filename;
 
     if (this->server_role_ == PRIMARY)
       { // We are the primary
@@ -433,17 +438,20 @@ TAO_FT_Naming_Server::init_replication_manager_with_orb (int argc,
                           ACE_TEXT ("(%P|%t) - FT_Naming_Server ")
                           ACE_TEXT ("narrowing IOR\n")));
             if (CORBA::is_nil (peer_ref.in ()))
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("(%P|%t) ERROR: IOR in file %s is not ")
-                                 ACE_TEXT ("a FT_Naming::ReplicationManager\n"),
-                                 primary_file_name.c_str ()),
-                                -1);
+              ACE_ERROR_RETURN (
+                (LM_ERROR,
+                 ACE_TEXT ("(%P|%t) ERROR: IOR in file %s is not ")
+                 ACE_TEXT ("a FT_Naming::ReplicationManager\n"),
+                 primary_file_name.c_str ()),
+                -1);
 
             try {
               if (TAO_debug_level > 3)
-                ACE_DEBUG ((LM_DEBUG,
-                            ACE_TEXT ("(%P|%t) - FT_Naming_Server registering ")
-                            ACE_TEXT ("with backup.\n")));
+                ACE_DEBUG (
+                  (LM_DEBUG,
+                   ACE_TEXT ("(%P|%t) - FT_Naming_Server registering ")
+                   ACE_TEXT ("with backup.\n")));
+
               // Register with the backup
               CosNaming::NamingContext_var root = this->my_root_context ();
               FT_Naming::NamingManager_var nm = this->my_naming_manager ();
@@ -682,7 +690,8 @@ TAO_FT_Naming_Server::parse_args (int argc,
 #endif /* !CORBA_E_MICRO */
       case 'z':
         this->use_round_trip_timeout_ = 1;
-        this->round_trip_timeout_ = (int)1.0e7 * ACE_OS::atoi (get_opts.opt_arg ());
+        this->round_trip_timeout_ =
+          (int)1.0e7 * ACE_OS::atoi (get_opts.opt_arg ());
         break;
       case 0:   // A long option was found
         {
@@ -693,7 +702,8 @@ TAO_FT_Naming_Server::parse_args (int argc,
               this->server_role_ = TAO_FT_Naming_Server::BACKUP;
               role_defined = true;
             }
-          else if (ACE_OS::strcmp (long_option, ACE_TEXT ("primary")) == 0)
+          else if (ACE_OS::strcmp (long_option,
+                                   ACE_TEXT ("primary")) == 0)
             {
               this->replica_id_ = ACE_TEXT ("Primary");
               this->server_role_ = TAO_FT_Naming_Server::PRIMARY;
@@ -886,7 +896,8 @@ TAO_FT_Naming_Server::read_reference_from_file (const char* replica_file_name,
   }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception (ACE_TEXT ("Invalid object reference in file: %s\n"));
+      ex._tao_print_exception (
+        ACE_TEXT ("Invalid object reference in file: %s\n"));
       return -1;
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
index 534f4a45343..653b4ef90c0 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
@@ -55,8 +55,8 @@ TAO_FT_Storable_Naming_Context::is_object_group (CORBA::Object_ptr obj) const
 CORBA::Object_ptr
 TAO_FT_Storable_Naming_Context::resolve (const CosNaming::Name& n)
 {
-  // Invoke the base class resolve operation to acquire the object at the specified
-  // compound name.  Any exceptions should flow back to client.
+  // Invoke the base class resolve operation to acquire the object at the
+  // specified compound name.  Any exceptions should flow back to client.
   CORBA::Object_var resolved_ref =
     TAO_Storable_Naming_Context::resolve(n);
 
@@ -75,7 +75,7 @@ TAO_FT_Storable_Naming_Context::resolve (const CosNaming::Name& n)
     if ( this->naming_manager_ == 0)
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("TAO_FT_Persistent_Naming_Context::resolve ")
+                  ACE_TEXT ("TAO_FT_Storable_Naming_Context::resolve ")
                   ACE_TEXT ("- No NamingManager defined.\n")));
 
       throw CORBA::INTERNAL ();
@@ -93,10 +93,10 @@ TAO_FT_Storable_Naming_Context::resolve (const CosNaming::Name& n)
   }
   catch (CORBA::Exception& ex)
   {
-     ex._tao_print_exception (
+    ex._tao_print_exception (
        ACE_TEXT ("TAO_FT_Storable_Naming_Context::resolve - ")
        ACE_TEXT ("Some unhandled error occurred\n"));
-      return CORBA::Object::_nil ();
+    return CORBA::Object::_nil ();
   }
 
   return resolved_ref._retn ();
@@ -137,7 +137,8 @@ TAO_FT_Storable_Naming_Context::propagate_update_notification (
 }
 
 void
-TAO_FT_Storable_Naming_Context::set_naming_manager (TAO_FT_Naming_Manager *mgr_impl)
+TAO_FT_Storable_Naming_Context::set_naming_manager (
+  TAO_FT_Naming_Manager *mgr_impl)
 {
   naming_manager_ = mgr_impl;
 }
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
index 75c7e1f89df..1b4b8a6d975 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
@@ -1301,7 +1301,7 @@ do_persistence_name_test (
           }
           catch (const CosNaming::NamingContext::NotFound& second_ex)
             {
-              ex._tao_print_exception (
+              second_ex._tao_print_exception (
                   ACE_TEXT ("ERROR: It really is not there. Failing...\n"));
               return RC_ERROR;
             }
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 4c8ca2c2464..cdae1455171 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1194,7 +1194,6 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
      else if (0 != (current_arg = arg_shifter.get_the_parameter
                     (ACE_TEXT("-ORBDynamicThreadPoolName"))))
         {
-          // This option takes a boolean 0 (off/dissallow) or 1 (on/allow)
           this->orb_params_.dynamic_thread_pool_config_name (current_arg);
           arg_shifter.consume_arg ();
         }