Wait for the service communicator to be shutdown before to close the

    service database environment.

1 files changed, 22 insertions, 34 deletions

diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java
index f36ae356634..8261e4511b7 100644
--- a/java/src/IceBox/ServiceManagerI.java
+++ b/java/src/IceBox/ServiceManagerI.java
@@ -332,10 +332,18 @@ public final class ServiceManagerI extends _ServiceManagerDisp
         ServiceInfo info = (ServiceInfo)_services.remove(service);
         assert(info != null);
 
+	FailureException failureEx = null;
+
         try
         {
             info.service.stop();
 
+	    if(info.communicator != null)
+	    {
+		info.communicator.shutdown();
+		info.communicator.waitForShutdown();
+	    }
+
 	    if(info.dbEnv != null)
 	    {
 		info.dbEnv.close();
@@ -343,39 +351,15 @@ public final class ServiceManagerI extends _ServiceManagerDisp
         }
 	catch(Freeze.DBException ex)
 	{
-	    if(info.communicator != null)
-	    {
-		try
-		{
-		    info.communicator.destroy();
-		}
-		catch(Exception e)
-		{
-		}
-	    }
-
-            FailureException e = new FailureException();
-            e.reason = "ServiceManager: database exception in stop for service " + service + ": " + ex;
-            e.initCause(ex);
-            throw e;
+            failureEx = new FailureException();
+            failureEx.reason = "ServiceManager: database exception in stop for service " + service + ": " + ex;
+            failureEx.initCause(ex);
 	}
         catch(Exception ex)
         {
-	    if(info.communicator != null)
-	    {
-		try
-		{
-		    info.communicator.destroy();
-		}
-		catch(Exception e)
-		{
-		}
-	    }
-
-            FailureException e = new FailureException();
-            e.reason = "ServiceManager: exception in stop for service " + service + ": " + ex;
-            e.initCause(ex);
-            throw e;
+            failureEx = new FailureException();
+            failureEx.reason = "ServiceManager: exception in stop for service " + service + ": " + ex;
+            failureEx.initCause(ex);
         }
 
 	if(info.communicator != null)
@@ -386,12 +370,16 @@ public final class ServiceManagerI extends _ServiceManagerDisp
 	    }
 	    catch(Exception ex)
 	    {
-		FailureException e = new FailureException();
-		e.reason = "ServiceManager: exception in stop for service " + service + ": " + ex;
-		e.initCause(ex);
-		throw e;
+		failureEx = new FailureException();
+		failureEx.reason = "ServiceManager: exception in stop for service " + service + ": " + ex;
+		failureEx.initCause(ex);
 	    }
 	}
+
+	if(failureEx != null)
+	{
+	    throw failureEx;
+	}
     }
 
     private void