1 files changed, 16 insertions, 37 deletions

diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
index 122e2b06881..f47fe54a5cf 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
@@ -138,22 +138,19 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "(%t): main thread prio is %d\n", prio));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -167,14 +164,10 @@ main (int argc, char *argv[])
         {
           ACE_DEBUG ((LM_DEBUG, "Dyn Sched enabled\n"));
           CORBA::Object_ptr manager_obj =
-            orb->resolve_initial_references ("RTSchedulerManager"
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->resolve_initial_references ("RTSchedulerManager");
 
           TAO_RTScheduler_Manager_var manager =
-            TAO_RTScheduler_Manager::_narrow (manager_obj
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            TAO_RTScheduler_Manager::_narrow (manager_obj);
 
           Kokyu::DSRT_Dispatcher_Impl_t disp_impl_type;
           if (enable_yield)
@@ -195,13 +188,10 @@ main (int argc, char *argv[])
           manager->rtscheduler (scheduler);
 
           CORBA::Object_var object =
-            orb->resolve_initial_references ("RTScheduler_Current"
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->resolve_initial_references ("RTScheduler_Current");
 
           current  =
-            RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            RTScheduling::Current::_narrow (object.in ());
 
         }
 
@@ -226,7 +216,7 @@ main (int argc, char *argv[])
       worker1.wait ();
       worker2.wait ();
 
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "(%t): wait for worker threads done in main thread\n"));
 
       if (do_shutdown)
@@ -240,35 +230,29 @@ main (int argc, char *argv[])
               CORBA::Policy_ptr implicit_sched_param = 0;
               current->begin_scheduling_segment (0,
                                                  sched_param_policy.in (),
-                                                 implicit_sched_param
-                                                 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                 implicit_sched_param);
             }
 
             ACE_DEBUG ((LM_DEBUG, "(%t): about to call server shutdown\n"));
-            server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            server->shutdown ();
 
             ACE_DEBUG ((LM_DEBUG, "after shutdown call in main thread\n"));
 
 
             if (enable_dynamic_scheduling)
             {
-              current->end_scheduling_segment (0 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              current->end_scheduling_segment (0);
             }
         }
 
       scheduler->shutdown ();
       ACE_DEBUG ((LM_DEBUG, "scheduler shutdown done\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -295,7 +279,6 @@ Worker::Worker (CORBA::ORB_ptr orb,
 int
 Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   const char * name = 0;
   /*
   ACE_DEBUG ((LM_DEBUG, "(%t|%T):about to sleep for %d sec\n", sleep_time_));
@@ -334,21 +317,17 @@ Worker::svc (void)
       ACE_DEBUG ((LM_DEBUG, "(%t|%T):before begin_sched_segment\n"));
       scheduler_current_->begin_scheduling_segment (name,
                                                     sched_param_policy.in (),
-                                                    implicit_sched_param
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                                    implicit_sched_param);
       ACE_DEBUG ((LM_DEBUG, "(%t|%T):after begin_sched_segment\n"));
     }
 
   ACE_DEBUG ((LM_DEBUG, "(%t|%T):about to make two way call\n"));
-  server_->test_method (server_load_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  server_->test_method (server_load_);
   ACE_DEBUG ((LM_DEBUG, "(%t|%T):two way call done\n"));
 
   if (enable_dynamic_scheduling)
     {
       scheduler_current_->end_scheduling_segment (name);
-      ACE_CHECK_RETURN (-1);
     }
 
   ACE_DEBUG ((LM_DEBUG, "client worker thread (%t) done\n"));