1 files changed, 16 insertions, 40 deletions

diff --git a/TAO/tests/Abstract_Interface/server.cpp b/TAO/tests/Abstract_Interface/server.cpp
index 6a3c9034587..d9dca0ceb04 100644
--- a/TAO/tests/Abstract_Interface/server.cpp
+++ b/TAO/tests/Abstract_Interface/server.cpp
@@ -39,13 +39,11 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       // Create and register factory for BaseNode.
       BaseNode_init *bn_factory = 0;
@@ -54,9 +52,7 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (bn_factory->tao_repository_id (),
-                                   bn_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   bn_factory);
       bn_factory->_remove_ref (); // release ownership
 
       // Create and register factory for TreeController.
@@ -66,9 +62,7 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (tc_factory->tao_repository_id (),
-                                   tc_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   tc_factory);
       tc_factory->_remove_ref (); // release ownership
 
       // Create and register factory for StringNode.
@@ -78,15 +72,11 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (sn_factory->tao_repository_id (),
-                                   sn_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   sn_factory);
       sn_factory->_remove_ref (); // release ownership
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         {
@@ -96,13 +86,10 @@ main (int argc, char *argv[])
         }
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         {
@@ -111,13 +98,10 @@ main (int argc, char *argv[])
 
       passer_i servant;
       passer_var server =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       CORBA::String_var ior =
-              orb->object_to_string (server.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+              orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Activated as <%s>\n",
@@ -142,30 +126,22 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ACE_Time_Value tv (10);
-      orb->run (tv
-                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (tv);
 
       // Destroy the POA, waiting until the destruction terminates
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Server: exception caught - ");
+      ex._tao_print_exception ("Server: exception caught - ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }