ChangeLogTag: Mon Jun 6 18:05:52 2005 unknown <michel_j@ociweb.com>

2 files changed, 37 insertions, 27 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2eae0a9b473..0d0fc4ae626 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,43 +1,49 @@
+Mon Jun  6 18:05:52 2005  unknown  <michel_j@ociweb.com>
+
+        * orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
+
+          Escape more strings written to the xml file. This should fix bug 2129.
+
 Mon Jun  6 16:48:21 2005    <cleeland_c@ociweb.com>
 
-	* tao/IIOP_Acceptor.cpp (create_new_profile): Reverse the order of
-	  comparisons so that port numbers get compared first.  This
-	  should make comparisons marginally faster when hostnames are
-	  ridiculously long if the ports don't match.
+        * tao/IIOP_Acceptor.cpp (create_new_profile): Reverse the order of
+          comparisons so that port numbers get compared first.  This
+          should make comparisons marginally faster when hostnames are
+          ridiculously long if the ports don't match.
 
-	* tao/IIOP_Acceptor.cpp (create_shared_profile): Make port numbers
-	  a part of the comparison so that RTCORBA connections work
-	  properly.
+        * tao/IIOP_Acceptor.cpp (create_shared_profile): Make port numbers
+          a part of the comparison so that RTCORBA connections work
+          properly.
 
 Mon Jun  6 02:10:32 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* tao/TypeCode.cpp (equivalent):
+        * tao/TypeCode.cpp (equivalent):
 
-	  Pass the unaliased TypeCode to the subclass equivalent_i()
-	  template method instead of the potentially aliased one.  Fixes
-	  equivalence failures between an aliased TypeCode and unaliased
-	  TypeCode.  Thanks to Jiang Wei <jiangwei_1976 at yahoo dot com
-	  dot cn> for reporting the problem and providing a simple test
-	  case.  [Bug 2140]
+          Pass the unaliased TypeCode to the subclass equivalent_i()
+          template method instead of the potentially aliased one.  Fixes
+          equivalence failures between an aliased TypeCode and unaliased
+          TypeCode.  Thanks to Jiang Wei <jiangwei_1976 at yahoo dot com
+          dot cn> for reporting the problem and providing a simple test
+          case.  [Bug 2140]
 
 Fri Jun  3 10:21:50 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* tests/Any/Recursive/client.cpp:
+        * tests/Any/Recursive/client.cpp:
 
-	  Fixed unused argument warnings in emulated exception builds.
+          Fixed unused argument warnings in emulated exception builds.
 
-	  Fixed syntax errors in minimum CORBA builds.
+          Fixed syntax errors in minimum CORBA builds.
 
 Fri Jun  3 09:17:13 2005  Chris Cleeland  <cleeland_c@ociweb.com>
 
         * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp (main):
 
-	  Since this code was copied from
-	  TAO_IIOP_Acceptor::probe_interfaces(), update this code to look
-	  like the code there.  This was also in response to seemingly
-	  nonsense complaints on one platform in the line containing
-	  ACE_static_cast(), so hopefully the change to static_cast<>
-	  remedies that as well.
+          Since this code was copied from
+          TAO_IIOP_Acceptor::probe_interfaces(), update this code to look
+          like the code there.  This was also in response to seemingly
+          nonsense complaints on one platform in the line containing
+          ACE_static_cast(), so hopefully the change to static_cast<>
+          remedies that as well.
 
 Fri Jun  3 14:49:14 2005  Simon McQueen  <sm@prismtech.com>
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index fa02fc2c92c..6f256cec9e1 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -218,19 +218,23 @@ static void saveAsXML(const ACE_CString& fname, Locator_Repository& repo) {
   for (; siit.next(sientry); siit.advance()) {
     Server_Info_Ptr& info = sientry->int_id_;
 
+    ACE_CString name = ACEXML_escape_string(info->name);
+    ACE_CString activator = ACEXML_escape_string(info->activator);
     ACE_CString cmdline = ACEXML_escape_string(info->cmdline);
     ACE_CString wdir = ACEXML_escape_string(info->dir);
+    ACE_CString partial_ior = ACEXML_escape_string(info->partial_ior);
+    ACE_CString ior = ACEXML_escape_string(info->ior);
 
     ACE_OS::fprintf(fp,"\t<%s", Locator_XMLHandler::SERVER_INFO_TAG);
-    ACE_OS::fprintf(fp," name=\"%s\"", info->name.c_str());
-    ACE_OS::fprintf(fp," activator=\"%s\"", info->activator.c_str());
+    ACE_OS::fprintf(fp," name=\"%s\"", name.c_str());
+    ACE_OS::fprintf(fp," activator=\"%s\"", activator.c_str());
     ACE_OS::fprintf(fp," command_line=\"%s\"", cmdline.c_str());
     ACE_OS::fprintf(fp," working_dir=\"%s\"", wdir.c_str());
     ACE_CString amodestr = ImR_Utils::activationModeToString(info->activation_mode);
     ACE_OS::fprintf(fp," activation_mode=\"%s\"", amodestr.c_str());
     ACE_OS::fprintf(fp," start_limit=\"%d\"", info->start_limit);
-    ACE_OS::fprintf(fp," partial_ior=\"%s\"", info->partial_ior.c_str());
-    ACE_OS::fprintf(fp," ior=\"%s\"", info->ior.c_str());
+    ACE_OS::fprintf(fp," partial_ior=\"%s\"", partial_ior.c_str());
+    ACE_OS::fprintf(fp," ior=\"%s\"", ior.c_str());
     ACE_OS::fprintf(fp,">\n");
 
     for (CORBA::ULong i = 0; i < info->env_vars.length(); ++i)