ChangeLogTag: Thu Jan 25 17:39:59 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

1 files changed, 14 insertions, 20 deletions

diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
index 5674ddc0a24..04a344cd0ef 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
@@ -95,13 +95,13 @@ main (int argc, char *argv[])
 
   task_stats.init (100000);
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -109,7 +109,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -120,12 +120,10 @@ main (int argc, char *argv[])
       if (enable_dynamic_scheduling)
         {
           CORBA::Object_ptr manager_obj =
-            orb->resolve_initial_references ("RTSchedulerManager"
-                                             ACE_ENV_ARG_PARAMETER);
+            orb->resolve_initial_references ("RTSchedulerManager");
 
           TAO_RTScheduler_Manager_var manager =
-            TAO_RTScheduler_Manager::_narrow (manager_obj
-                                              ACE_ENV_ARG_PARAMETER);
+            TAO_RTScheduler_Manager::_narrow (manager_obj);
 
           Kokyu::DSRT_Dispatcher_Impl_t disp_impl_type;
           if (enable_yield)
@@ -146,11 +144,10 @@ main (int argc, char *argv[])
           manager->rtscheduler (scheduler);
 
           CORBA::Object_var object =
-            orb->resolve_initial_references ("RTScheduler_Current"
-                                              ACE_ENV_ARG_PARAMETER);
+            orb->resolve_initial_references ("RTScheduler_Current");
 
           current  =
-            RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+            RTScheduling::Current::_narrow (object.in ());
         }
 
       Simple_Server_i server_impl (orb.in (),
@@ -162,7 +159,7 @@ main (int argc, char *argv[])
         server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -208,13 +205,12 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "shutting down scheduler\n"));
       scheduler->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "Exiting main...\n"));
   task_stats.dump_samples ("timeline.txt",
@@ -233,17 +229,15 @@ Worker::Worker (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_Time_Value tv(120);
 
-  ACE_TRY
+  try
     {
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
+      this->orb_->run (tv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%t|%T): Worker thread exiting...\n"));
   return 0;
 }