summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Service.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2008-03-14 18:47:45 +0100
committerBenoit Foucher <benoit@zeroc.com>2008-03-14 18:47:45 +0100
commit1ec8426013773ceb6b649137b7016793065d6c44 (patch)
treebcdf2e9f0bd4eba61e08aebd61e5801e4fdf04dd /cpp/src/Ice/Service.cpp
parentBug 2787 (diff)
downloadice-1ec8426013773ceb6b649137b7016793065d6c44.tar.bz2
ice-1ec8426013773ceb6b649137b7016793065d6c44.tar.xz
ice-1ec8426013773ceb6b649137b7016793065d6c44.zip
Fixed bug 2684 + collocation optimization bug
Diffstat (limited to 'cpp/src/Ice/Service.cpp')
-rw-r--r--cpp/src/Ice/Service.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index 123083abf27..af3838b2b5c 100644
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -389,7 +389,17 @@ Ice::Service::main(int& argc, char* argv[], const InitializationData& initializa
// Ice.EventLog.Source on Windows.
//
InitializationData initData = initializationData;
- initData.properties = createProperties(argc, argv, initData.properties, initData.stringConverter);
+ try
+ {
+ initData.properties = createProperties(argc, argv, initData.properties, initData.stringConverter);
+ }
+ catch(const Ice::Exception& ex)
+ {
+ ostringstream ostr;
+ ostr << ex;
+ error(ostr.str());
+ return EXIT_FAILURE;
+ }
#ifdef _WIN32