[freenet-cvs] r11798 - in trunk/freenet/src/freenet: client support/io

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-02-15 14:07:37 +0000 (Thu, 15 Feb 2007)
New Revision: 11798

Modified:
   trunk/freenet/src/freenet/client/ArchiveManager.java
   trunk/freenet/src/freenet/client/ArchiveStoreContext.java
   trunk/freenet/src/freenet/client/ArchiveStoreItem.java
   trunk/freenet/src/freenet/client/RealArchiveStoreItem.java
   trunk/freenet/src/freenet/client/TempStoreElement.java
   trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java
Log:
Get rid of some finalizers, simplify others... Thanks to Anonymous at 
o9_0DTuZniSf_+oDmRsonByWxsI for suggesting those on frost.

Review is welcome

Modified: trunk/freenet/src/freenet/client/ArchiveManager.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveManager.java        2007-02-15 
01:53:15 UTC (rev 11797)
+++ trunk/freenet/src/freenet/client/ArchiveManager.java        2007-02-15 
14:07:37 UTC (rev 11798)
@@ -235,7 +235,7 @@
                                                if(readBytes > 
maxArchivedFileSize) {
                                                        addErrorElement(ctx, 
key, name, "File too big: "+maxArchivedFileSize+" greater than current archived 
file size limit "+maxArchivedFileSize);
                                                        out.close();
-                                                       temp.finalize();
+                                                       
temp.underBucket.finalize();
                                                        continue outer;
                                                }
                                        }
@@ -393,7 +393,7 @@
        private void trimStoredData() {
                while((cachedData > maxCachedData) || (storedData.size() > 
maxCachedElements)) {
                        ArchiveStoreItem e = (ArchiveStoreItem) 
storedData.popValue();
-                       e.finalize();
+                       e.context.removeItem(e);
                }
        }


Modified: trunk/freenet/src/freenet/client/ArchiveStoreContext.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveStoreContext.java   2007-02-15 
01:53:15 UTC (rev 11797)
+++ trunk/freenet/src/freenet/client/ArchiveStoreContext.java   2007-02-15 
14:07:37 UTC (rev 11798)
@@ -106,7 +106,7 @@
                        }
                        if(item == null) break;
                        manager.removeCachedItem(item);
-                       item.finalize();
+                       item.context.removeItem(item);
                }
        }


Modified: trunk/freenet/src/freenet/client/ArchiveStoreItem.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveStoreItem.java      2007-02-15 
01:53:15 UTC (rev 11797)
+++ trunk/freenet/src/freenet/client/ArchiveStoreItem.java      2007-02-15 
14:07:37 UTC (rev 11798)
@@ -20,13 +20,6 @@
                context.addItem(this);
        }

-       /** Expected to delete any stored data on disk, and decrement 
cachedData.
-        * Implemented to remove self from context.
-        */
-       protected void finalize() {
-               context.removeItem(this);
-       }
-
        /**
         * Return cached data as a Bucket, or throw an ArchiveFailureException.
         */

Modified: trunk/freenet/src/freenet/client/RealArchiveStoreItem.java
===================================================================
--- trunk/freenet/src/freenet/client/RealArchiveStoreItem.java  2007-02-15 
01:53:15 UTC (rev 11797)
+++ trunk/freenet/src/freenet/client/RealArchiveStoreItem.java  2007-02-15 
14:07:37 UTC (rev 11798)
@@ -60,7 +60,7 @@
        }

        public synchronized void finalize() {
-               super.finalize();
+               super.context.removeItem(this);
                if(finalized) return;
                long sz = spaceUsed();
                underBucket.finalize();

Modified: trunk/freenet/src/freenet/client/TempStoreElement.java
===================================================================
--- trunk/freenet/src/freenet/client/TempStoreElement.java      2007-02-15 
01:53:15 UTC (rev 11797)
+++ trunk/freenet/src/freenet/client/TempStoreElement.java      2007-02-15 
14:07:37 UTC (rev 11798)
@@ -18,8 +18,4 @@
        File myFilename;
        PaddedEphemerallyEncryptedBucket bucket;
        FileBucket underBucket;
-       
-       public void finalize() {
-               underBucket.finalize();
-       }
 }
\ No newline at end of file

Modified: trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java   
2007-02-15 01:53:15 UTC (rev 11797)
+++ trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java   
2007-02-15 14:07:37 UTC (rev 11798)
@@ -115,14 +115,6 @@
                public void close() throws IOException {
                        f.close();
                }
-               
-               public void finalize() {
-                       try {
-                               close();
-                       } catch (IOException e) {
-                               // Ignore
-                       }
-               }
        }

        public class ReadOnlyFileSliceBucketException extends IOException {
@@ -139,9 +131,7 @@

        }

-       public void free() {
-               // Do nothing
-       }
+       public void free() {}

        public SimpleFieldSet toFieldSet() {
                SimpleFieldSet fs = new SimpleFieldSet(false);