1 files changed, 23 insertions, 52 deletions

diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
index f290a52e718..481540e1c45 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
@@ -15,24 +15,17 @@ DT_Test::DT_Test (void)
 }
 
 int
-DT_Test::init (int argc, char *argv []
-         ACE_ENV_ARG_DECL)
+DT_Test::init (int argc, char *argv [])
 {
   orb_ = CORBA::ORB_init (argc,
         argv,
-        ""
-        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+        "");
 
   dt_creator_->orb (orb_.in ());
 
-  CORBA::Object_ptr manager_obj = orb_->resolve_initial_references ("RTSchedulerManager"
-                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Object_ptr manager_obj = orb_->resolve_initial_references ("RTSchedulerManager");
 
-  TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj);
 
 
   ACE_NEW_RETURN (scheduler_,
@@ -41,50 +34,36 @@ DT_Test::init (int argc, char *argv []
   manager->rtscheduler (scheduler_);
 
   CORBA::Object_var object =
-    orb_->resolve_initial_references ("RTScheduler_Current"
-              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb_->resolve_initial_references ("RTScheduler_Current");
 
   current_  =
-    RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    RTScheduling::Current::_narrow (object.in ());
 
   return 0;
 }
 
 void
-DT_Test::run (int argc, char* argv []
-        ACE_ENV_ARG_DECL)
+DT_Test::run (int argc, char* argv [])
 {
-  init (argc,argv
-  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  init (argc,argv);
 
   TASK_STATS::instance ()->init (this->dt_creator_->total_load ());
-  if (this->dt_creator_->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
+  if (this->dt_creator_->resolve_naming_service () == -1)
     return;
-  ACE_CHECK;
 
-  this->dt_creator_->activate_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->dt_creator_->activate_root_poa ();
 
-  this->dt_creator_->activate_poa_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->dt_creator_->activate_job_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->dt_creator_->activate_schedule (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->dt_creator_->activate_poa_list ();
+  this->dt_creator_->activate_job_list ();
+  this->dt_creator_->activate_schedule ();
 
   DT_Creator* dt_creator = this->dt_creator_;
-  dt_creator->register_synch_obj (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  dt_creator->register_synch_obj ();
 
   ACE_DEBUG ((LM_DEBUG,
         "Registered Synch Object\n"));
 
-  dt_creator_->create_distributable_threads (current_.in ()
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  dt_creator_->create_distributable_threads (current_.in ());
 
   orb_->destroy ();
 
@@ -130,20 +109,16 @@ long flags;
 int
 DT_Test::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      dt_creator_->create_distributable_threads (current_.in ()
-             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      dt_creator_->create_distributable_threads (current_.in ());
 
     }
-  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;
 }
@@ -158,24 +133,20 @@ DT_Test::current (void)
 int
 main (int argc, char* argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_MIF_DT_Creator);
 
     ACE_DEBUG ((LM_DEBUG,
          "%t\n"));
-      DT_TEST::instance ()->run (argc, argv
-         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      DT_TEST::instance ()->run (argc, argv);
 
     }
-  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;
 }