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

1 files changed, 5 insertions, 7 deletions

diff --git a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
index ea24fac6cf9..7063ce4f534 100644
--- a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
+++ b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
@@ -39,14 +39,13 @@ extern "C" void handler (int)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Argv_Type_Converter argcon (argc, argv);
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
         CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv (),
-                         "" ACE_ENV_ARG_PARAMETER);
+                         "");
 
       ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGHUP);
 
@@ -54,7 +53,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         {
           ACE_Time_Value tv (5, 0);
 
-          orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
+          orb->perform_work (tv);
 
           ACE_DEBUG ((LM_DEBUG,
                       "Reconfig flag = %d\n",
@@ -65,11 +64,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, argv[0]);
+      ex._tao_print_exception (argv[0]);
     }
-  ACE_ENDTRY;
 
   return -1;
 }