Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 6 insertions, 21 deletions

diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
index f290a52e718..f5a253138dd 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
@@ -22,17 +22,14 @@ DT_Test::init (int argc, char *argv []
         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);
 
   TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj
                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
 
   ACE_NEW_RETURN (scheduler_,
@@ -43,11 +40,9 @@ DT_Test::init (int argc, char *argv []
   CORBA::Object_var object =
     orb_->resolve_initial_references ("RTScheduler_Current"
               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   current_  =
     RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -58,33 +53,25 @@ DT_Test::run (int argc, char* argv []
 {
   init (argc,argv
   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   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;
 
   orb_->destroy ();
 
@@ -134,7 +121,6 @@ DT_Test::svc (void)
     {
       dt_creator_->create_distributable_threads (current_.in ()
              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
     }
   ACE_CATCHANY
@@ -166,7 +152,6 @@ main (int argc, char* argv [])
          "%t\n"));
       DT_TEST::instance ()->run (argc, argv
          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
     }
   ACE_CATCHANY