summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2002-11-29 04:40:54 +0000
committerbala <balanatarajan@users.noreply.github.com>2002-11-29 04:40:54 +0000
commit379b57599db2268645a1fb1e1945c65a264cef4a (patch)
tree927b9a37e3e710f8c415f44cd11ecc564a657247
parent96da1231698ada078b9e6101bdc6d9da869951fa (diff)
downloadATCD-379b57599db2268645a1fb1e1945c65a264cef4a.tar.gz
ChangeLogTag: Thu Nov 28 22:39:38 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp37
2 files changed, 30 insertions, 12 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f0938c280f2..ddf93105773 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 28 22:39:38 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
+
+ *
+ orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp: Fixed warnings in builds where excetions are turned off.
+
Thu Nov 28 22:30:37 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
* tests/OBV/TC_Alignment/client.cpp: Fixed errors and warnings in
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
index aa003f45ed6..bee3c93890b 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
@@ -169,22 +169,35 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_DECLARE_NEW_CORBA_ENV;
- Event_Logging_Service service;
+ ACE_TRY
+ {
+ Event_Logging_Service service;
+
+ service.startup (argc,
+ argv
+ ACE_ENV_ARG_PARAMETER);
+
+ ACE_TRY_CHECK;
+
+ if (service.run () == -1)
+ {
+ service.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- if (service.startup (argc, argv ACE_ENV_ARG_PARAMETER) == -1)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Failed to start the Event Logging Service.\n"),
- 1);
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "Failed to run the Telecom Log Service.\n"),
+ 1);
- if (service.run () == -1)
+ ACE_TRY_CHECK;
+ }
+
+ service.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+ }
+ ACE_CATCHANY
{
- service.shutdown ();
- ACE_ERROR_RETURN ((LM_ERROR,
- "Failed to run the Telecom Log Service.\n"),
- 1);
+ // no -op
}
-
- service.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_ENDTRY;
return 0;
}