- Removing BufferManager class and BasicStream.destroy(), which reduces the

    complexity of many existing finalizers.
- Removed code that cleans up cached objects.
- For compatibility with C#, finalizers no longer call methods on other
    objects.

1 files changed, 6 insertions, 21 deletions

diff --git a/java/src/Ice/_ObjectDelM.java b/java/src/Ice/_ObjectDelM.java
index 718183e7c79..82695e5d7b5 100644
--- a/java/src/Ice/_ObjectDelM.java
+++ b/java/src/Ice/_ObjectDelM.java
@@ -204,7 +204,7 @@ public class _ObjectDelM implements _ObjectDel
     getOutgoing(String operation, OperationMode mode, java.util.Map context)
 	throws IceInternal.NonRepeatable
     {
-        IceInternal.Outgoing out;
+        IceInternal.Outgoing out = null;
 
         synchronized(__outgoingMutex)
         {
@@ -216,8 +216,9 @@ public class _ObjectDelM implements _ObjectDel
             {
                 out = __outgoingCache;
                 __outgoingCache = __outgoingCache.next;
-                out.reset(operation, mode, context);
-            }
+		out.reset(operation, mode, context);
+		out.next = null;
+	    }
         }
 
         return out;
@@ -226,26 +227,10 @@ public class _ObjectDelM implements _ObjectDel
     protected void
     reclaimOutgoing(IceInternal.Outgoing out)
     {
-        synchronized(__outgoingMutex)
-        {
-            out.next = __outgoingCache;
-            __outgoingCache = out;
-        }
-    }
-
-    protected void
-    finalize()
-        throws Throwable
-    {
 	synchronized(__outgoingMutex)
 	{
-	    while(__outgoingCache != null)
-	    {
-		IceInternal.Outgoing next = __outgoingCache.next;
-		__outgoingCache.destroy();
-		__outgoingCache.next = null;
-		__outgoingCache = next;
-	    }
+	    out.next = __outgoingCache;
+	    __outgoingCache = out;
 	}
     }