bug 1994: IceStorm service cannot be restarted

1 files changed, 17 insertions, 14 deletions

diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index d6f1cac0800..7664b0890ac 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -542,21 +542,24 @@ IceBox::ServiceManagerI::stopAll()
     for(p = _services.rbegin(); p != _services.rend(); ++p)
     {
         ServiceInfo& info = *p;
-        try
-        {
-            info.service->stop();
-            info.active = false;
-        }
-        catch(const Ice::Exception& ex)
-        {
-            Warning out(_logger);
-            out << "ServiceManager: exception in stop for service " << info.name << ":\n";
-            out << ex;
-        }
-        catch(...)
+        if(info.active)
         {
-            Warning out(_logger);
-            out << "ServiceManager: unknown exception in stop for service " << info.name;
+            try
+            {
+                info.service->stop();
+                info.active = false;
+            }
+            catch(const Ice::Exception& ex)
+            {
+                Warning out(_logger);
+                out << "ServiceManager: exception in stop for service " << info.name << ":\n";
+                out << ex;
+            }
+            catch(...)
+            {
+                Warning out(_logger);
+                out << "ServiceManager: unknown exception in stop for service " << info.name;
+            }
         }
     }