summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2002-04-02 22:49:43 +0000
committerMark Spruiell <mes@zeroc.com>2002-04-02 22:49:43 +0000
commitbb165aedf1ef93ce39bc7efa4b80166d54ef670b (patch)
tree76b3acf5a2ec43bf0825015cb3df82700e9a23f8 /cpp/src
parentremoving print stmts (diff)
downloadice-bb165aedf1ef93ce39bc7efa4b80166d54ef670b.tar.bz2
ice-bb165aedf1ef93ce39bc7efa4b80166d54ef670b.tar.xz
ice-bb165aedf1ef93ce39bc7efa4b80166d54ef670b.zip
minor fixes
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceBox/ServiceManagerI.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index fb6345d4969..fe2434576bd 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -121,6 +121,10 @@ IceBox::ServiceManagerI::run()
{
(*r).second.service->start();
}
+ catch (const FailureException& ex)
+ {
+ throw;
+ }
catch (const Exception& ex)
{
FailureException ex;
@@ -130,13 +134,19 @@ IceBox::ServiceManagerI::run()
}
//
- // We may want to notify external scripts that the services have started.
- // This is done by defining IceBox.PrintServicesReady=bundleName
- // Where bundleName is whatever you choose to call this set of services.
- // It will be echoed back as "bundleName ready".
+ // We may want to notify external scripts that the services
+ // have started. This is done by defining the property:
+ //
+ // IceBox.PrintServicesReady=bundleName
+ //
+ // Where bundleName is whatever you choose to call this set of
+ // services. It will be echoed back as "bundleName ready".
+ //
+ // This must be done after start() has been invoked on the
+ // services.
//
string bundleName = properties->getProperty("IceBox.PrintServicesReady");
- if (bundleName.length() > 0)
+ if (!bundleName.empty())
{
cout << bundleName << " ready" << endl;
}
@@ -315,16 +325,6 @@ IceBox::ServiceManagerI::stop(const string& service)
{
info.service->stop();
}
- catch (const FailureException& ex)
- {
- //
- // Release the service before the library
- //
- info.service = 0;
- info.library = 0;
-
- throw;
- }
catch (const Exception& ex)
{
//