1 files changed, 14 insertions, 0 deletions
diff --git a/java/src/IceInternal/ServantManager.java b/java/src/IceInternal/ServantManager.java
index 931b383b7fe..8e4dcc1374a 100644
--- a/java/src/IceInternal/ServantManager.java
+++ b/java/src/IceInternal/ServantManager.java
@@ -199,6 +199,20 @@ public final class ServantManager
         _adapterName = adapterName;
     }
 
+    protected void
+    finalize()
+        throws Throwable
+    {
+        //
+        // Don't check whether destroy() has been called. It might have
+        // not been called if the associated object adapter was not
+        // properly deactivated.
+        //
+        //IceUtilInternal.Assert.FinalizerAssert(_instance == null);
+        
+        super.finalize();
+    }
+
     //
     // Only for use by Ice.ObjectAdapterI.
     //