1 files changed, 3 insertions, 28 deletions
diff --git a/java/src/Freeze/ConnectionI.java b/java/src/Freeze/ConnectionI.java
index 45053c39556..3913ec614a6 100644
--- a/java/src/Freeze/ConnectionI.java
+++ b/java/src/Freeze/ConnectionI.java
@@ -61,12 +61,6 @@ class ConnectionI implements Connection
     }
 
 
-    public void
-    close()
-    {
-        close(false);
-    }
-
     public Ice.Communicator
     getCommunicator()
     {
@@ -79,23 +73,11 @@ class ConnectionI implements Connection
         return _envName;
     }
 
-    protected void
-    finalize()
-    {
-        close(true);
-    }
-
-    void
-    close(boolean finalizing)
+    public void
+    close()
     {
         if(_transaction != null)
         {
-            if(finalizing)
-            {
-                _communicator.getLogger().warning
-                    ("Finalizing Connection on DbEnv \"" +  _envName + "\" with active transaction");
-            }
-            
             try
             {
                 _transaction.rollback();
@@ -114,7 +96,7 @@ class ConnectionI implements Connection
             java.util.Iterator p = _mapList.iterator();
             while(p.hasNext())
             {
-                ((Map) p.next()).close(finalizing);
+                ((Map) p.next()).close();
             }
         }
         
@@ -142,7 +124,6 @@ class ConnectionI implements Connection
         
         Ice.Properties properties = _communicator.getProperties();
         _deadlockWarning = properties.getPropertyAsInt("Freeze.Warn.Deadlocks") > 0;
-        _closeInFinalizeWarning = properties.getPropertyAsIntWithDefault("Freeze.Warn.CloseInFinalize", 1) > 0; 
     }
 
     ConnectionI(Ice.Communicator communicator, String envName, com.sleepycat.db.Environment dbEnv)
@@ -235,11 +216,6 @@ class ConnectionI implements Connection
         return _deadlockWarning;
     }
 
-    final boolean
-    closeInFinalizeWarning()
-    {
-        return _closeInFinalizeWarning;
-    }
 
     private String errorPrefix()
     {
@@ -255,5 +231,4 @@ class ConnectionI implements Connection
     private int _trace;
     private int _txTrace;
     private boolean _deadlockWarning;
-    private boolean _closeInFinalizeWarning;
 }