http://wiki.zeroc.com/bugzilla/show_bug.cgi?id=528

1 files changed, 42 insertions, 1 deletions

diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index 14317a827c9..216e4f5abae 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -338,7 +338,47 @@ IceBox::ServiceManagerI::start(const string& service, const string& entryPoint,
 	//
 	// Start the service.
 	//
-	info.service->start(service, communicator, serviceArgs);
+	try
+	{
+	    info.service->start(service, communicator, serviceArgs);
+	}
+	catch(...)
+	{
+	    if(info.communicator)
+	    {
+		try
+		{
+		    info.communicator->shutdown();
+		    info.communicator->waitForShutdown();
+		}
+		catch(const Ice::CommunicatorDestroyedException&)
+		{
+		    //
+		    // Ignore, the service might have already destroyed
+		    // the communicator for its own reasons.
+		    //
+		}
+		catch(const Ice::Exception& ex)
+		{
+		    Warning out(_logger);
+		    out << "ServiceManager: exception in shutting down communicator for service " << service << ":\n";
+		    out << ex;
+		}
+
+		try
+		{
+		    info.communicator->destroy();
+		    info.communicator = 0;
+		}
+		catch(const Exception& ex)
+		{
+		    Warning out(_logger);
+		    out << "ServiceManager: exception in shutting down communicator for service " << service << ":\n";
+		    out << ex;
+		}
+	    }
+	    throw;
+	}
 
         info.library = library;
         _services[service] = info;
@@ -470,3 +510,4 @@ IceBox::ServiceManagerI::stopAll()
 
     _services.clear();
 }
+