diff options
Diffstat (limited to 'TAO/orbsvcs/Notify_Service/Notify_Server.cpp')
| -rw-r--r-- | TAO/orbsvcs/Notify_Service/Notify_Server.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp index f6c1bf84ba9..37a6e780994 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp @@ -48,8 +48,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Notify_Service_Shutdown_Functor killer (notify_service); Service_Shutdown kill_contractor (killer); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY_NEW_ENV + try { // Set the properties instance before initializing the notify // service. Using the static singleton can cause static @@ -58,7 +57,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) TAO_Notify_Properties properties; TAO_Notify_Properties::instance (&properties); - int result = notify_service.init (argc, argv ACE_ENV_ARG_PARAMETER); + int result = notify_service.init (argc, argv); if (result == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -67,13 +66,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) notify_service.run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ex, ACE_TEXT("Failed to run the Notification Service\n")); return 1; } - ACE_ENDTRY; return 0; } |