1 files changed, 13 insertions, 23 deletions

diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 22e055649e3..cee5062bfff 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -30,16 +30,14 @@ TAO_Naming_Service::init (int argc,
 {
   int result;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Copy command line parameter.
       ACE_Argv_Type_Converter command_line(argc, argv);
 
       // Initialize the ORB
       this->orb_ =
-        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0);
 
       // Parse the args for '-t' option. If '-t' option is passed, do
       // the needful and then remove the option from the list of
@@ -55,13 +53,11 @@ TAO_Naming_Service::init (int argc,
       if (result == -1)
         return result;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Service::init");
+      ex._tao_print_exception ("TAO_Naming_Service::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -105,49 +101,43 @@ TAO_Naming_Service::parse_args (int &argc,
 
 // Run the ORB event loop.
 int
-TAO_Naming_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Naming_Service::run (void)
 {
   if (time_ == 0)
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->orb_->run ();
     }
   else
     {
       ACE_Time_Value tv (time_);
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->orb_->run (tv);
     }
 
   return 0;
 }
 
 void
-TAO_Naming_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Naming_Service::shutdown (void)
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
 
 int
 TAO_Naming_Service::fini (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   this->my_naming_server_.fini();
 
-  ACE_TRY
+  try
   {
     // destroy implies shutdown
-    this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_->destroy ();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Service::fini");
+    ex._tao_print_exception ("TAO_Naming_Service::fini");
     return -1;
   }
-  ACE_ENDTRY;
   return 0;
 }