1 files changed, 4 insertions, 19 deletions

diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp
index d7f4cf4e6e0..f7d2b63c058 100644
--- a/TAO/tests/Faults/client.cpp
+++ b/TAO/tests/Faults/client.cpp
@@ -72,11 +72,9 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -85,25 +83,20 @@ main (int argc, char *argv[])
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
         orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Simple_Server_var server =
         Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -116,15 +109,13 @@ main (int argc, char *argv[])
       Callback_i callback_impl (orb.in ());
 
       Callback_var callback =
-        callback_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        callback_impl._this ();
 
       for (int i = 0; i != niterations; ++i)
         {
           CORBA::Long r =
             server->test_method (0, 0, callback.in ()
                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           if (r != 0)
             {
@@ -147,7 +138,6 @@ main (int argc, char *argv[])
               // Expected exception, continue....
             }
           ACE_ENDTRY;
-          ACE_TRY_CHECK;
         }
       else if (do_crash)
         {
@@ -162,30 +152,25 @@ main (int argc, char *argv[])
               // Expected exception, continue....
             }
           ACE_ENDTRY;
-          ACE_TRY_CHECK;
         }
       else if (do_suicide)
         {
           (void) server->test_method (1, 0, callback.in ()
                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
           ACE_DEBUG ((LM_DEBUG, "ERROR: client should have aborted\n"));
         }
       else if (do_self_shutdown)
         {
           (void) server->test_method (1, 1, callback.in ()
                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
         }
 
       if (do_shutdown)
         {
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
         }
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
     }
   ACE_CATCH (CORBA::COMM_FAILURE, x)