diff --git a/htroot/PerformanceMemory_p.java b/htroot/PerformanceMemory_p.java index 75dbc377e..7558fd2f5 100644 --- a/htroot/PerformanceMemory_p.java +++ b/htroot/PerformanceMemory_p.java @@ -25,7 +25,6 @@ //if the shell's current path is HTROOT //import java.util.Iterator; -import java.io.File; import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.Map; @@ -40,7 +39,6 @@ import net.yacy.cora.util.ConcurrentLog; import net.yacy.kelondro.index.Cache; import net.yacy.kelondro.index.RAMIndex; import net.yacy.kelondro.table.Table; -import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.Formatter; import net.yacy.kelondro.util.MemoryControl; import net.yacy.search.Switchboard; @@ -52,16 +50,12 @@ public class PerformanceMemory_p { private static final long KB = 1024; private static final long MB = 1024 * KB; - private static Map defaultSettings = null; public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header, final serverObjects post, final serverSwitch env) { // return variable that accumulates replacements Switchboard sb = (Switchboard) env; final serverObjects prop = new serverObjects(); - if (defaultSettings == null) { - defaultSettings = FileUtils.loadMap(new File(env.getAppPath(), "defaults/yacy.init")); - } prop.put("gc", "0"); prop.put("autoreload.checked", "0"); @@ -146,7 +140,7 @@ public class PerformanceMemory_p { totalmem += mem; prop.put("EcoList_" + c + "_tableKeyMem", Formatter.bytesToString(mem)); prop.put("EcoList_" + c + "_tableKeyChunkSize", mapx.get(Table.StatKeys.tableKeyChunkSize)); - + v = mapx.get(Table.StatKeys.tableValueMem); mem = v == null ? 0 : Long.parseLong(v); totalmem += mem;