diff --git a/htroot/CacheAdmin_p.java b/htroot/CacheAdmin_p.java index 91c87362d..6380b5ee4 100644 --- a/htroot/CacheAdmin_p.java +++ b/htroot/CacheAdmin_p.java @@ -84,11 +84,9 @@ public class CacheAdmin_p { } final String fileString = pathString; - final File cache = new File(switchboard.getConfig("proxyCache", "DATA/HTCACHE")); - File dir; - final File file = new File(cache, pathString); - final URL url = plasmaHTCache.getURL(cache, file); + final File file = new File(switchboard.htCachePath, pathString); + final URL url = plasmaHTCache.getURL(switchboard.htCachePath, file); if (file.isDirectory()) { dir = file; diff --git a/source/de/anomic/plasma/plasmaSwitchboard.java b/source/de/anomic/plasma/plasmaSwitchboard.java index d49f8e395..6e7c53d69 100644 --- a/source/de/anomic/plasma/plasmaSwitchboard.java +++ b/source/de/anomic/plasma/plasmaSwitchboard.java @@ -157,7 +157,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser public static plasmaURLPattern urlBlacklist; // storage management - private File cachePath; + public File htCachePath; private File plasmaPath; public File listsPath; public plasmaURLPool urlPool; @@ -299,7 +299,6 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser String cache = getConfig("proxyCache", "DATA/HTCACHE"); cache = cache.replace('\\', '/'); if (cache.endsWith("/")) { cache = cache.substring(0, cache.length() - 1); } - File htCachePath; if (new File(cache).isAbsolute()) { htCachePath = new File(cache); // don't use rootPath } else {