1 files changed, 5 insertions, 20 deletions

diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp
index 11b8a975a14..e9cec1fbd91 100644
--- a/TAO/tests/Crashed_Callback/server.cpp
+++ b/TAO/tests/Crashed_Callback/server.cpp
@@ -43,15 +43,12 @@ 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;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,19 +56,16 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Make all oneways "reliable."
       {
         CORBA::Object_var manager_object =
           orb->resolve_initial_references("ORBPolicyManager"
                                           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
         CORBA::PolicyManager_var policy_manager =
           CORBA::PolicyManager::_narrow(manager_object.in()
                                         ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         if (CORBA::is_nil (policy_manager.in ()))
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -84,15 +78,12 @@ main (int argc, char *argv[])
           orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                               policy_value
                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         policy_manager->set_policy_overrides (policies,
                                               CORBA::ADD_OVERRIDE
                                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
-        policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        policies[0]->destroy ();
       }
 
       if (parse_args (argc, argv) != 0)
@@ -105,12 +96,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(service_impl);
 
       Test::Service_var service =
-        service_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        service_impl->_this ();
 
       CORBA::String_var ior =
         orb->object_to_string (service.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -122,22 +111,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ACE_Time_Value tv (50, 0);
       orb->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Event loop finished\n"));
 
       service_impl->dump_results ();
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   ACE_CATCHANY
     {