Added ObjectAdapter::destroy

1 files changed, 27 insertions, 9 deletions

diff --git a/cs/src/Ice/ObjectAdapterFactory.cs b/cs/src/Ice/ObjectAdapterFactory.cs
index b62f73e40a2..2f561decbc4 100755
--- a/cs/src/Ice/ObjectAdapterFactory.cs
+++ b/cs/src/Ice/ObjectAdapterFactory.cs
@@ -81,14 +81,6 @@ namespace IceInternal
 		{
 		    adapter.waitForDeactivate();
 		}
-
-		//
-		// We're done, now we can throw away the object adapters.
-		//
-		// We set _adapters to null because our destructor must not
-		// invoke methods on member objects.
-		//
-		_adapters = null;
 	    }
 	    
 	    lock(this)
@@ -100,6 +92,32 @@ namespace IceInternal
 		System.Threading.Monitor.PulseAll(this);
 	    }
 	}
+
+	public void destroy()
+	{
+	    //
+	    // First wait for shutdown to finish.
+	    //
+	    waitForShutdown();
+
+	    Hashtable adapters;
+
+	    lock(this)
+	    {
+	        adapters = _adapters;
+
+		//
+		// We set _adapters to null because our destructor must not
+		// invoke methods on member objects.
+		//
+		_adapters = null;
+	    }
+
+	    foreach(Ice.ObjectAdapter adapter in adapters.Values)
+	    {
+	        adapter.destroy();
+	    }
+	}
 	
 	public Ice.ObjectAdapter createObjectAdapter(string name, string endpoints, Ice.RouterPrx router)
 	{
@@ -175,7 +193,7 @@ namespace IceInternal
 	{
 	    lock(this)
 	    {
-	        if(_waitForShutdown)
+	        if(_waitForShutdown || _adapters == null)
 		{
 		    return;
 		}