ChangeLogTag: Thu Jan 25 17:39:59 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

1 files changed, 9 insertions, 13 deletions

diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
index a4eee121d2f..eab4bc5f74b 100644
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
@@ -35,13 +35,13 @@ CORBA::Boolean
 check_is_equivalent (const char* ior1, const char * ior2, CORBA::Boolean expected_result)
 {
   CORBA::Boolean result = 1;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object1 =
-        orb->string_to_object(ior1 ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior1);
 
       CORBA::Object_var object2 =
-        orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior2);
 
       const char* expected_result_string = (expected_result ? "true" : "false");
 
@@ -59,14 +59,12 @@ check_is_equivalent (const char* ior1, const char * ior2, CORBA::Boolean expecte
           result = 0;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_ERROR, "Vastly unexpected exception comparing %s and %s:\n", ior1, ior2));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception:");
+      ex._tao_print_exception ("Exception:");
       result = 0;
     }
-  ACE_ENDTRY;
   return result;
 }
 
@@ -74,10 +72,10 @@ int
 main (int argc, char *argv[])
 {
   CORBA::Boolean result = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -296,13 +294,11 @@ main (int argc, char *argv[])
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return result;
 }