1 files changed, 13 insertions, 15 deletions

diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
index b70a2cfd393..ebdf3be3ad7 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
@@ -45,20 +45,20 @@ main (int argc, char *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("Hello_server"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_DEBUG ((LM_DEBUG, "Begin of Hello_Server test\n"));
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       //------ Get Root POA & POA Manager references
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -71,19 +71,19 @@ main (int argc, char *argv[])
       //------- Get IOR Table reference to support CORBALOC URLs
 
       obj =
-        orb->resolve_initial_references("IORTable" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("IORTable");
 
       IORTable::Table_var ior_table =
-        IORTable::Table::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow(obj.in());
 
 
       //------- Get NameService Root Context
 
       obj =
-        orb->resolve_initial_references("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("NameService");
 
       CosNaming::NamingContextExt_var root_nc =
-        CosNaming::NamingContextExt::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContextExt::_narrow(obj.in());
 
       //-------- Prepare Servant
 
@@ -100,7 +100,7 @@ main (int argc, char *argv[])
         hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (hello.in ());
 
       //--------- Publish IOR using various means
 
@@ -115,7 +115,7 @@ main (int argc, char *argv[])
         }
 
       if (!CORBA::is_nil(ior_table.in()))
-        ior_table->bind("HelloObj", ior.in() ACE_ENV_ARG_PARAMETER);
+        ior_table->bind("HelloObj", ior.in());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -133,7 +133,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - Root poa destroyed\n"));
 
@@ -143,14 +143,12 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "server exiting\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_END_TEST;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_END_TEST;
   return 0;