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

1 files changed, 7 insertions, 9 deletions

diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
index 9de2488801a..9fbfff745b2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
@@ -8,12 +8,12 @@
 
 int main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var ns_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (ns_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -21,8 +21,7 @@ int main (int argc, char *argv[])
                           1);
 
       CosNaming::NamingContext_var inc =
-        CosNaming::NamingContext::_narrow (ns_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (ns_obj.in ());
 
       if (CORBA::is_nil (inc.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -33,16 +32,15 @@ int main (int argc, char *argv[])
       name.length (1);
       name[0].id = CORBA::string_dup ("yourself");
 
-      inc->bind (name, ns_obj.in () ACE_ENV_ARG_PARAMETER);
+      inc->bind (name, ns_obj.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Test Successful\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Test");
+      ex._tao_print_exception ("Test");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }