Author: toad
Date: 2008-02-09 15:18:41 +0000 (Sat, 09 Feb 2008)
New Revision: 17760
Modified:
trunk/freenet/src/freenet/node/ConfigurablePersister.java
Log:
Only make the default relative to baseDir.
Modified: trunk/freenet/src/freenet/node/ConfigurablePersister.java
===================================================================
--- trunk/freenet/src/freenet/node/ConfigurablePersister.java 2008-02-09
15:09:04 UTC (rev 17759)
+++ trunk/freenet/src/freenet/node/ConfigurablePersister.java 2008-02-09
15:18:41 UTC (rev 17760)
@@ -10,13 +10,10 @@
public class ConfigurablePersister extends Persister {
- private final File baseDir;
-
public ConfigurablePersister(Persistable t, SubConfig nodeConfig,
String optionName,
String defaultFilename, int sortOrder, boolean expert,
boolean forceWrite, String shortDesc, String longDesc, PacketSender ps, File
baseDir) throws NodeInitException {
super(t, ps);
- this.baseDir = baseDir;
- nodeConfig.register(optionName, defaultFilename, sortOrder,
expert, forceWrite, shortDesc, longDesc, new StringCallback() {
+ nodeConfig.register(optionName, new File(baseDir,
defaultFilename).toString(), sortOrder, expert, forceWrite, shortDesc,
longDesc, new StringCallback() {
public String get() {
return persistTarget.toString();
@@ -38,9 +35,6 @@
private void setThrottles(String val) throws
InvalidConfigValueException {
File f = new File(val);
- if(!f.isAbsolute()) {
- f = new File(baseDir, val);
- }
File tmp = new File(f.toString()+".tmp");
while(true) {
if(f.exists()) {
