Author: toad
Date: 2007-07-24 17:37:10 +0000 (Tue, 24 Jul 2007)
New Revision: 14315

Modified:
   trunk/freenet/src/freenet/support/io/PersistentTempFileBucket.java
   trunk/freenet/src/freenet/support/io/TempFileBucket.java
Log:
Move to PersistentTempFileBucket

Modified: trunk/freenet/src/freenet/support/io/PersistentTempFileBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/PersistentTempFileBucket.java  
2007-07-24 17:35:44 UTC (rev 14314)
+++ trunk/freenet/src/freenet/support/io/PersistentTempFileBucket.java  
2007-07-24 17:37:10 UTC (rev 14315)
@@ -37,4 +37,11 @@
                return bucket;
        }

+       public SimpleFieldSet toFieldSet() {
+               if(deleteOnFinalize()) return null;
+               SimpleFieldSet fs = super.toFieldSet();
+               fs.putOverwrite("Type", "TempFileBucket");
+               return fs;
+       }
+       
 }

Modified: trunk/freenet/src/freenet/support/io/TempFileBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/TempFileBucket.java    2007-07-24 
17:35:44 UTC (rev 14314)
+++ trunk/freenet/src/freenet/support/io/TempFileBucket.java    2007-07-24 
17:37:10 UTC (rev 14315)
@@ -203,10 +203,7 @@
        }

        public SimpleFieldSet toFieldSet() {
-               if(deleteOnFinalize()) return null;
-               SimpleFieldSet fs = super.toFieldSet();
-               fs.putOverwrite("Type", "TempFileBucket");
-               return fs;
+               return null; // Not persistent
        }

        protected boolean createFileOnly() {


Reply via email to