1 files changed, 10 insertions, 25 deletions

diff --git a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
index 42a390c4b01..3501ebf87f8 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
@@ -9,22 +9,16 @@
 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_CHECK_RETURN (-1);
+			 "");
 
-      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
-								       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager");
 
-      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ()
-									      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ());
 
       TAO_Scheduler scheduler (orb.in ());
 
@@ -44,35 +38,26 @@ main (int argc, char* argv [])
       ACE_DEBUG ((LM_DEBUG,
 		  "Cancelling Threads.....\n"));
 
-      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current"
-								       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current");
 
-      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in ()
-									  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in ());
 
       for (int i = 0; i < 4; i++)
         {
-          RTScheduling::DistributableThread_var DT = current->lookup ((task.guids ())[i]
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          RTScheduling::DistributableThread_var DT = current->lookup ((task.guids ())[i]);
 
-          DT->cancel (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          DT->cancel ();
         }
 
       orb->run ();
 
       ACE_Thread_Manager::instance ()->wait ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }