ChangeLogTag: Mon Nov 29 21:57:06 MST 2004 Scott Harris <harris_s@ociweb.com>

6 files changed, 20 insertions, 7 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 707f574db09..d060712973d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Mon Nov 29 21:57:06 MST 2004  Scott Harris <harris_s@ociweb.com>
+
+        * examples/Load_Balancing_persistent/Identity_Client.cpp:
+        * examples/Load_Balancing_persistent/Load_Balancer_i.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp:
+
+          Removed extra commas after ACE_TEXT macros that should 
+          not have been there because the strings should have
+          been concatenated.  Originally found a bad log output
+          and searched for other similar problems.
+
 Mon Nov 29 16:45:00 2004 Huang-Ming Huang <hh1@cse.wustl.edu>
         * orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
           Fixed problem when the immediate successor of the primary crashes. Thanks
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
index 77d9a529374..eeecdfa03ae 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
@@ -115,7 +115,7 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 
   if (obj.in () == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%N|%l) <ERROR> [Identity_Client::run] \n"),
+                       ACE_TEXT ("(%N|%l) <ERROR> [Identity_Client::run] \n")
                        ACE_TEXT ("factory_resolve \n")),
                       -1);
 
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
index cfba0d60e66..3bc9e1c72c4 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
@@ -335,7 +335,7 @@ Object_Group_Factory_i::resolve (const char * id
                                  (void *&)this->rr_groups_) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("(%N|%l) The factory does not have any references "),
+                             ACE_TEXT ("(%N|%l) The factory does not have any references ")
                              ACE_TEXT ("to the group that you have sought \n\n")),
                             0);
         }
@@ -347,7 +347,7 @@ Object_Group_Factory_i::resolve (const char * id
                                  (void *&)this->random_groups_) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("(%N|%l) The factory does not have any references "),
+                             ACE_TEXT ("(%N|%l) The factory does not have any references ")
                              ACE_TEXT ("to the group that you have sought \n\n")),
                             0);
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
index 1051d5fc140..8191b1709d6 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
@@ -262,7 +262,7 @@ TAO::HTIOP::Acceptor::open (TAO_ORB_Core *orb_core,
       // This is bad mojo, i.e. an internal TAO error.
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("TAO (%P|%t) ")
-                         ACE_TEXT ("TAO::HTIOP::Acceptor::open - "),
+                         ACE_TEXT ("TAO::HTIOP::Acceptor::open - ")
                          ACE_TEXT ("hostname already set\n\n")),
                         -1);
     }
@@ -418,7 +418,7 @@ TAO::HTIOP::Acceptor::open_default (TAO_ORB_Core *orb_core,
       // This is bad mojo, i.e. an internal TAO error.
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("TAO (%P|%t) ")
-                         ACE_TEXT ("TAO::HTIOP::Acceptor::open_default - "),
+                         ACE_TEXT ("TAO::HTIOP::Acceptor::open_default - ")
                          ACE_TEXT ("hostname already set\n\n")),
                         -1);
     }
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
index 953058ae01d..e6e76efb217 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
@@ -111,7 +111,7 @@ TAO::HTIOP::Transport::recv (char *buf,
     {
 
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - TAO::HTIOP::Transport[%d]::recv_i, "),
+                  ACE_TEXT ("TAO (%P|%t) - TAO::HTIOP::Transport[%d]::recv_i, ")
                   ACE_TEXT ("read failure - %m"),
                   this->id ()));
     }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
index c089762f6ac..aa6f60f8de9 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
@@ -96,7 +96,7 @@ TAO_UIPMC_Acceptor::open (TAO_ORB_Core *orb_core,
       // This is bad mojo, i.e. an internal TAO error.
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("TAO (%P|%t) ")
-                         ACE_TEXT ("UIPMC_Acceptor::open - "),
+                         ACE_TEXT ("UIPMC_Acceptor::open - ")
                          ACE_TEXT ("hostname already set\n\n")),
                         -1);
     }