Disabled finalizers once process shutdown has started. This isn't perfect

    yet -- Mark's changes to finalizers aren't all in there yet.

1 files changed, 6 insertions, 6 deletions

diff --git a/cs/src/Ice/ObjectAdapterFactory.cs b/cs/src/Ice/ObjectAdapterFactory.cs
index 4640cc8a7af..b3051e51772 100755
--- a/cs/src/Ice/ObjectAdapterFactory.cs
+++ b/cs/src/Ice/ObjectAdapterFactory.cs
@@ -165,18 +165,18 @@ namespace IceInternal
 	    _waitForShutdown = false;
 	}
 	
+#if DEBUG
 	~ObjectAdapterFactory()
 	{
-#if DEBUG
 	    lock(this)
 	    {
-		Debug.Assert(_instance == null);
-		Debug.Assert(_communicator == null);
-		Debug.Assert(_adapters != null);
-		Debug.Assert(!_waitForShutdown);
+		IceUtil.Assert.FinalizerAssert(_instance == null);
+		IceUtil.Assert.FinalizerAssert(_communicator == null);
+		IceUtil.Assert.FinalizerAssert(_adapters != null);
+		IceUtil.Assert.FinalizerAssert(!_waitForShutdown);
 	    }
-#endif DEBUG
 	}
+#endif
 	
 	private Instance _instance;
 	private Ice.Communicator _communicator;