Wed Aug 4 08:41:54 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
          Fixed compile errors

2 files changed, 13 insertions, 10 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 26ab96973d9..5a8e24d4471 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,16 +1,21 @@
+Wed Aug  4 08:41:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
+          Fixed compile errors
+
 Tue Aug  3 14:48:42 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Environment.cpp:
-        
+
           Added Id string.
-          
+
         * tao/Object.inl:
         * tao/Valuetype/AbstractBase.inl:
-        
+
           Replace 'inline' with 'ACE_INLINE'.
-          
+
         * TAO_IDL/be/be_visitor_argument/argument.cpp:
-        
+
           Added missing final newline.
 
 Tue Aug  3 14:17:23 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index 6092c74f041..0974d75e53d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -192,18 +192,16 @@ static int loadAsXML (const ACE_CString& fname, Locator_Repository& repo)
   parser.setErrorHandler (&handler);
   parser.setEntityResolver (&handler);
 
-  ACEXML_TRY_NEW_ENV
+  try
     {
-      parser.parse (&input ACEXML_ENV_ARG_PARAMETER);
-      ACEXML_TRY_CHECK;
+      parser.parse (&input);
     }
-  ACEXML_CATCH (ACEXML_Exception, ex)
+  catch (const ACEXML_Exception& ex)
     {
       ACE_ERROR ((LM_ERROR, "Error during load of ImR persistence xml file."));
       ex.print ();
       return -1;
     }
-  ACEXML_ENDTRY;
   return 0;
 }