1 files changed, 13 insertions, 5 deletions
diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java
index c9cb79a13ec..804c309328d 100644
--- a/java/src/IceInternal/ObjectAdapterFactory.java
+++ b/java/src/IceInternal/ObjectAdapterFactory.java
@@ -206,11 +206,19 @@ public final class ObjectAdapterFactory
     finalize()
         throws Throwable
     {
-        IceUtilInternal.Assert.FinalizerAssert(_instance == null);
-        IceUtilInternal.Assert.FinalizerAssert(_communicator == null);
-        //IceUtilInternal.Assert.FinalizerAssert(_adapters.isEmpty())
-
-        super.finalize();
+        try
+        {
+            IceUtilInternal.Assert.FinalizerAssert(_instance == null);
+            IceUtilInternal.Assert.FinalizerAssert(_communicator == null);
+            IceUtilInternal.Assert.FinalizerAssert(_adapters.isEmpty());
+        }
+        catch(java.lang.Exception ex)
+        {
+        }
+        finally
+        {
+            super.finalize();
+        }
     }
 
     private Instance _instance;