1 files changed, 18 insertions, 39 deletions

diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp
index b71951cf34b..b471eba752f 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp
@@ -33,31 +33,23 @@ Consumer_Handler::init (int argc,
    // necessary.
   filtering_criteria = argc > 1 ? argv[1] : "";
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    0);
 
       CORBA::Object_var poa_object  =
-        this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Save the Shutdown callback.
       this->shutdowncallback = _shutdowncallback;
@@ -67,9 +59,8 @@ Consumer_Handler::init (int argc,
 
       // Start the servant.
       this->receiver_ =
-        this->receiver_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->receiver_i_._this ();
 
-      ACE_TRY_CHECK;
 
       if (this->get_notifier () == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,16 +70,13 @@ Consumer_Handler::init (int argc,
 
       // Subscribe ourselves with the notifier's broker.
       this->notifier_->subscribe (this->receiver_.in (),
-                                  filtering_criteria
-                                  ACE_ENV_ARG_PARAMETER);
+                                  filtering_criteria);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
    {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Consumer_Handler::init\n");
+     ex._tao_print_exception ("Consumer_Handler::init\n");
      return -1;
    }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -96,7 +84,7 @@ Consumer_Handler::init (int argc,
 int
 Consumer_Handler::get_notifier (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialization of the naming service.
       if (naming_services_client_.init (orb_.in ()) != 0)
@@ -110,24 +98,18 @@ Consumer_Handler::get_notifier (void)
       notifier_ref_name[0].id = CORBA::string_dup (NOTIFIER_BIND_NAME);
 
       CORBA::Object_var notifier_obj =
-        this->naming_services_client_->resolve (notifier_ref_name
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_services_client_->resolve (notifier_ref_name);
 
       // The CORBA::Object_var object is downcast to Notifier_var
       // using the <_narrow> method.
       this->notifier_ =
-        Event_Comm::Notifier::_narrow (notifier_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Event_Comm::Notifier::_narrow (notifier_obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Consumer_Handler::get_notifier\n");
+      ex._tao_print_exception ("Consumer_Handler::get_notifier\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -153,16 +135,13 @@ Consumer_Handler::run (void)
               "Running the Consumer...\n"));
 
   // Run the ORB.
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   return 0;
 }