Author: toad
Date: 2007-06-15 18:37:48 +0000 (Fri, 15 Jun 2007)
New Revision: 13610
Modified:
trunk/freenet/src/freenet/node/NodeClientCore.java
trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java
trunk/freenet/src/freenet/node/updater/NodeUpdater.java
trunk/freenet/src/freenet/node/updater/RevocationChecker.java
trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
Log:
Fix previous build, and use the persistent temp dir not the regular temp dir,
so we can reclaim the last several versions of the .fblob later on if it is
useful to do so.
Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java 2007-06-15 18:34:50 UTC
(rev 13609)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java 2007-06-15 18:37:48 UTC
(rev 13610)
@@ -1062,4 +1062,12 @@
public Ticker getTicker() {
return node.ps;
}
+
+ public File getPersistentTempDir() {
+ return persistentTempBucketFactory.getDir();
+ }
+
+ public File getTempDir() {
+ return tempDir;
+ }
}
Modified: trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java
2007-06-15 18:34:50 UTC (rev 13609)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java
2007-06-15 18:37:48 UTC (rev 13610)
@@ -141,7 +141,7 @@
updaterConfig.finishedInitialization();
- this.revocationChecker = new RevocationChecker(this, new
File(node.clientCore.getTempDir(), "revocation-key.fblob"));
+ this.revocationChecker = new RevocationChecker(this, new
File(node.clientCore.getPersistentTempDir(), "revocation-key.fblob"));
this.uom = new UpdateOverMandatoryManager(this);
}
Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2007-06-15
18:34:50 UTC (rev 13609)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2007-06-15
18:37:48 UTC (rev 13610)
@@ -126,7 +126,7 @@
if(availableVersion > currentVersion)
System.err.println("Starting
"+(extUpdate?"freenet-ext.jar ":"")+"fetch for "+availableVersion);
tempBlobFile =
-
File.createTempFile(blobFilenamePrefix+"-"+availableVersion, ".fblob.tmp",
manager.node.clientCore.getTempDir());
+
File.createTempFile(blobFilenamePrefix+"-"+availableVersion, ".fblob.tmp",
manager.node.clientCore.getPersistentTempDir());
cg = new ClientGetter(this,
core.requestStarters.chkFetchScheduler, core.requestStarters.sskFetchScheduler,
URI.setSuggestedEdition(availableVersion), ctx,
RequestStarter.UPDATE_PRIORITY_CLASS,
this, new
ArrayBucket(), new FileBucket(tempBlobFile, false, false, false, false, false));
@@ -150,7 +150,7 @@
}
File getBlobFile(int availableVersion) {
- return new File(node.clientCore.getTempDir(),
blobFilenamePrefix+availableVersion+".fblob");
+ return new File(node.clientCore.getPersistentTempDir(),
blobFilenamePrefix+availableVersion+".fblob");
}
private final Object writeJarSync = new Object();
Modified: trunk/freenet/src/freenet/node/updater/RevocationChecker.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/RevocationChecker.java
2007-06-15 18:34:50 UTC (rev 13609)
+++ trunk/freenet/src/freenet/node/updater/RevocationChecker.java
2007-06-15 18:37:48 UTC (rev 13610)
@@ -99,7 +99,7 @@
if(logMINOR) Logger.minor(this,
"fetcher="+revocationGetter);
if(revocationGetter != null &&
logMINOR) Logger.minor(this, "revocation fetcher:
cancelled="+revocationGetter.isCancelled()+",
finished="+revocationGetter.isFinished());
try {
- tmpBlobFile =
File.createTempFile("revocation-", ".fblob.tmp",
manager.node.clientCore.getTempDir());
+ tmpBlobFile =
File.createTempFile("revocation-", ".fblob.tmp",
manager.node.clientCore.getPersistentTempDir());
} catch (IOException e) {
Logger.error(this, "Cannot
record revocation fetch (therefore cannot pass it on to peers)!: "+e, e);
}
Modified: trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2007-06-15 18:34:50 UTC (rev 13609)
+++ trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2007-06-15 18:37:48 UTC (rev 13610)
@@ -616,7 +616,7 @@
final File temp;
try {
- temp = File.createTempFile("revocation-", ".fblob.tmp",
updateManager.node.clientCore.getTempDir());
+ temp = File.createTempFile("revocation-", ".fblob.tmp",
updateManager.node.clientCore.getPersistentTempDir());
temp.deleteOnExit();
} catch (IOException e) {
System.err.println("Cannot save revocation certificate
to disk and therefore cannot fetch it from our peer!: "+e);
@@ -713,7 +713,7 @@
File f;
FileBucket b = null;
try {
- f = File.createTempFile("revocation-", ".fblob.tmp",
updateManager.node.clientCore.getTempDir());
+ f = File.createTempFile("revocation-", ".fblob.tmp",
updateManager.node.clientCore.getPersistentTempDir());
b = new FileBucket(f, false, false, true, true, true);
} catch (IOException e) {
Logger.error(this, "Cannot share revocation key from
"+source.userToString()+" with our peers because cannot write the cleaned
version to disk: "+e, e);
@@ -995,7 +995,7 @@
final File temp;
try {
- temp = File.createTempFile("main-", ".fblob.tmp",
updateManager.node.clientCore.getTempDir());
+ temp = File.createTempFile("main-", ".fblob.tmp",
updateManager.node.clientCore.getPersistentTempDir());
temp.deleteOnExit();
} catch (IOException e) {
System.err.println("Cannot save new main jar to disk
and therefore cannot fetch it from our peer!: "+e);
@@ -1093,7 +1093,7 @@
File f;
FileBucket b = null;
try {
- f = File.createTempFile("main-", ".fblob.tmp",
updateManager.node.clientCore.getTempDir());
+ f = File.createTempFile("main-", ".fblob.tmp",
updateManager.node.clientCore.getPersistentTempDir());
b = new FileBucket(f, false, false, true, true, true);
} catch (IOException e) {
Logger.error(this, "Cannot share main jar from
"+source.userToString()+" with our peers because cannot write the cleaned
version to disk: "+e, e);
