Author: toad
Date: 2009-03-07 20:30:55 +0000 (Sat, 07 Mar 2009)
New Revision: 25947

Modified:
   branches/db4o/freenet/src/freenet/support/io/TempFileBucket.java
Log:
deleteOnFree, not deleteOnFinalize (but use it for that too) - don't delete 
shadow buckets on free()


Modified: branches/db4o/freenet/src/freenet/support/io/TempFileBucket.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/io/TempFileBucket.java    
2009-03-07 20:30:00 UTC (rev 25946)
+++ branches/db4o/freenet/src/freenet/support/io/TempFileBucket.java    
2009-03-07 20:30:55 UTC (rev 25947)
@@ -24,7 +24,7 @@
        final FilenameGenerator generator;
        private static boolean logDebug = true;
        private boolean readOnly;
-       private final boolean deleteOnFinalize;
+       private final boolean deleteOnFree;
        /**
         * Constructor for the TempFileBucket object
         *
@@ -32,11 +32,11 @@
         */
        public TempFileBucket(
                long id,
-               FilenameGenerator generator, boolean deleteOnFinalize) {
+               FilenameGenerator generator, boolean deleteOnFree) {
                super(generator.getFilename(id));
                this.filenameID = id;
                this.generator = generator;
-               this.deleteOnFinalize = deleteOnFinalize;
+               this.deleteOnFree = deleteOnFree;
                synchronized(this) {
                        logDebug = Logger.shouldLog(Logger.DEBUG, this);
                }
@@ -55,7 +55,7 @@
        protected boolean deleteOnFinalize() {
                // Make sure finalize wacks temp file 
                // if it is not explictly freed.
-               return deleteOnFinalize;
+               return deleteOnFree; // not if shadow
        }
        
        @Override
@@ -73,7 +73,7 @@
 
        @Override
        protected boolean deleteOnFree() {
-               return true;
+               return deleteOnFree;
        }
 
        @Override

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to