1 files changed, 9 insertions, 19 deletions

diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp
index 0e4ac57360f..e85e052248e 100644
--- a/TAO/tests/InterOp-Naming/INS_test_client.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp
@@ -13,15 +13,12 @@ main (int argc, char *argv[])
 {
   int i = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Retrieve a reference to the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       if (argc < 2)
         {
@@ -38,8 +35,7 @@ main (int argc, char *argv[])
             {
               // List initial services
               CORBA::ORB::ObjectIdList_var list =
-                orb->list_initial_services (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                orb->list_initial_services ();
 
               size_t length = list->length ();
 
@@ -69,8 +65,7 @@ main (int argc, char *argv[])
             }
           else
             {
-              objref = orb->resolve_initial_references (argv[i] ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              objref = orb->resolve_initial_references (argv[i]);
 
               if (CORBA::is_nil (objref.in ()))
                 ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,9 +73,7 @@ main (int argc, char *argv[])
                                    "given name.\n"),
                                   -1);
 
-              INS_var server = INS::_narrow (objref.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              INS_var server = INS::_narrow (objref.in ());
 
               CORBA::String_var iorstr =
                 orb->object_to_string (server.in ());
@@ -90,8 +83,7 @@ main (int argc, char *argv[])
                           iorstr.in()));
 
               CORBA::String_var test_ins_result =
-                server->test_ins (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                server->test_ins ();
 
               ACE_DEBUG ((LM_DEBUG,
                           "\nResult of Remote Call : %s\n",
@@ -99,17 +91,15 @@ main (int argc, char *argv[])
             }
         }
     }
-  ACE_CATCH (CORBA::ORB::InvalidName, name)
+  catch (const CORBA::ORB::InvalidName& )
     {
       ACE_DEBUG ((LM_DEBUG, "Cannot resolve <%s>\n", argv[i]));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
+      ex._tao_print_exception ("Exception:");
     }
 
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }