1 files changed, 17 insertions, 26 deletions

diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
index 23bbaa14770..7515eafacf3 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
@@ -75,7 +75,7 @@ TAO_Notify_Lanes_Consumer_Client::initialize (void)
 
   if (channel_seq->length() > 0)
     {
-      ec = ecf->get_event_channel (channel_seq[0] ACE_ENV_ARG_PARAMETER);
+      ec = ecf->get_event_channel (channel_seq[0]);
     }
   else
     {
@@ -87,7 +87,7 @@ TAO_Notify_Lanes_Consumer_Client::initialize (void)
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER);
+    ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin.in ()));
 
@@ -97,7 +97,7 @@ TAO_Notify_Lanes_Consumer_Client::initialize (void)
   this->consumer_ = new TAO_Notify_Lanes_Consumer (this->orb_objects_);
 
   // Initialize it.
-  this->consumer_->init (rt_poa, consumer_admin, this->event_type_ ACE_ENV_ARG_PARAMETER);
+  this->consumer_->init (rt_poa, consumer_admin, this->event_type_);
 }
 
 PortableServer::POA_ptr
@@ -110,13 +110,12 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (void)
   CORBA::Policy_var lanes_policy;
 
   CORBA::Policy_var activation_policy =
-    this->orb_objects_.root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
+    this->orb_objects_.root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
   // Create a priority model policy.
   priority_model_policy =
     this->orb_objects_.rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED
-                                                              , 0
-                                                              ACE_ENV_ARG_PARAMETER);
+                                                              , 0);
 
   RTCORBA::ThreadpoolLanes lanes (1);
   lanes.length (1);
@@ -140,13 +139,11 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (void)
                                                               allow_borrowing,
                                                               allow_request_buffering,
                                                               max_buffered_requests,
-                                                              max_request_buffer_size
-                                                              ACE_ENV_ARG_PARAMETER);
+                                                              max_request_buffer_size);
 
   // Create a thread-pool policy.
   lanes_policy =
-    this->orb_objects_.rt_orb_->create_threadpool_policy (threadpool_id
-                                                          ACE_ENV_ARG_PARAMETER);
+    this->orb_objects_.rt_orb_->create_threadpool_policy (threadpool_id);
 
   CORBA::PolicyList poa_policy_list;
 
@@ -160,8 +157,7 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (void)
 
   rt_poa = this->orb_objects_.root_poa_->create_POA ("RT POA!",
                                                      poa_manager.in (),
-                                                     poa_policy_list
-                                                     ACE_ENV_ARG_PARAMETER);
+                                                     poa_policy_list);
 
   return rt_poa._retn ();
 }
@@ -175,22 +171,20 @@ TAO_Notify_Lanes_Consumer_Client::run (void)
 int
 TAO_Notify_Lanes_Consumer_Client::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize this threads priority.
-      this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
+      this->orb_objects_.current_->the_priority (0);
 
       this->initialize (); //Init the Client
 
       this->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Supplier error "));
+      ex._tao_print_exception (ACE_TEXT ("Supplier error "));
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -198,17 +192,16 @@ TAO_Notify_Lanes_Consumer_Client::svc (void)
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize an ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
+                                            "");
 
       TAO_Notify_ORB_Objects orb_objects;
 
-      orb_objects.init (orb ACE_ENV_ARG_PARAMETER);
+      orb_objects.init (orb);
 
       TAO_Notify_ORB_Run_Task orb_run_task (orb_objects);
 
@@ -240,12 +233,10 @@ main (int argc, char *argv [])
       orb_run_task.thr_mgr ()->wait ();
       client.thr_mgr ()->wait ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Consumer Client error "));
+      ex._tao_print_exception (ACE_TEXT ("Consumer Client error "));
     }
-  ACE_ENDTRY;
 
   return 0;
 }