1 files changed, 5 insertions, 10 deletions
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
index 57cee4c14ed..9ad03908c0c 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
@@ -129,24 +129,19 @@ TAO_NT_Notify_Service::svc (void)
 {
   TAO_Notify_Service_Driver notify_service;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      if (notify_service.init (argc_, argv_ ACE_ENV_ARG_PARAMETER) == -1)
+      if (notify_service.init (argc_, argv_) == -1)
         return -1;
 
       report_status (SERVICE_RUNNING);
-      notify_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      notify_service.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO NT Notify Service");
+      ex._tao_print_exception ("TAO NT Notify Service");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
 
   return 0;
 }