Author: toad
Date: 2009-03-27 13:34:30 +0000 (Fri, 27 Mar 2009)
New Revision: 26228
Modified:
branches/db4o/freenet/src/freenet/support/io/TempFileBucket.java
Log:
deleteOnExit NOT deleteOnFree. Persistent temp buckets should be deleted on
free but not on exit.
Modified: branches/db4o/freenet/src/freenet/support/io/TempFileBucket.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/io/TempFileBucket.java
2009-03-27 13:34:01 UTC (rev 26227)
+++ branches/db4o/freenet/src/freenet/support/io/TempFileBucket.java
2009-03-27 13:34:30 UTC (rev 26228)
@@ -24,7 +24,7 @@
final FilenameGenerator generator;
private static boolean logDebug = true;
private boolean readOnly;
- private final boolean deleteOnFree;
+ private final boolean deleteOnExit;
/**
* Constructor for the TempFileBucket object
*
@@ -32,11 +32,11 @@
*/
public TempFileBucket(
long id,
- FilenameGenerator generator, boolean deleteOnFree) {
+ FilenameGenerator generator, boolean deleteOnExit) {
super(generator.getFilename(id));
this.filenameID = id;
this.generator = generator;
- this.deleteOnFree = deleteOnFree;
+ this.deleteOnExit = deleteOnExit;
synchronized(this) {
logDebug = Logger.shouldLog(Logger.DEBUG, this);
}
@@ -49,7 +49,7 @@
this,
"Initializing TempFileBucket(" +
getFile());
}
- if(deleteOnFree)
+ if(deleteOnExit)
setDeleteOnExit(getFile());
}
@@ -57,7 +57,7 @@
protected boolean deleteOnFinalize() {
// Make sure finalize wacks temp file
// if it is not explictly freed.
- return deleteOnFree; // not if shadow
+ return deleteOnExit; // not if shadow
}
@Override
@@ -75,7 +75,7 @@
@Override
protected boolean deleteOnFree() {
- return deleteOnFree;
+ return true;
}
@Override
@@ -93,7 +93,7 @@
@Override
protected boolean deleteOnExit() {
- return deleteOnFree;
+ return deleteOnExit;
}
public void storeTo(ObjectContainer container) {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
