From b3ca177a5d5febdebe1ae42ff92449f53dc88c3a Mon Sep 17 00:00:00 2001 From: orbiter Date: Fri, 9 Mar 2007 11:49:56 +0000 Subject: [PATCH] fix for http://www.yacy-forum.de/viewtopic.php?p=32797#32797 git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3459 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/PerformanceMemory_p.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/htroot/PerformanceMemory_p.java b/htroot/PerformanceMemory_p.java index 57b827a52..6b6adf1f4 100644 --- a/htroot/PerformanceMemory_p.java +++ b/htroot/PerformanceMemory_p.java @@ -120,12 +120,11 @@ public class PerformanceMemory_p { while (i.hasNext()) { filename = (String) i.next(); map = (Map) kelondroFlexTable.memoryStats(filename); - p = filename.indexOf("DATA"); ROmem = Long.parseLong((String) map.get("tableROIndexMem")); RWmem = Long.parseLong((String) map.get("tableRWIndexMem")); totalmem += ROmem; totalmem += RWmem; - prop.put("TableList_" + c + "_tableIndexPath", filename.substring(p)); + prop.put("TableList_" + c + "_tableIndexPath", ((p = filename.indexOf("DATA")) < 0) ? filename : filename.substring(p)); prop.put("TableList_" + c + "_tableIndexChunkSize", map.get("tableIndexChunkSize")); prop.put("TableList_" + c + "_tableROIndexCount", map.get("tableROIndexCount")); prop.put("TableList_" + c + "_tableROIndexMem", ROmem / (1024 * 1024)); @@ -144,10 +143,9 @@ public class PerformanceMemory_p { while (i.hasNext()) { filename = (String) i.next(); map = (Map) kelondroRecords.memoryStats(filename); - p = filename.indexOf("DATA"); mem = Long.parseLong((String) map.get("nodeCacheMem")); totalmem += mem; - prop.put("NodeList_" + c + "_nodeCachePath", filename.substring(p)); + prop.put("NodeList_" + c + "_nodeCachePath", ((p = filename.indexOf("DATA")) < 0) ? filename : filename.substring(p)); prop.put("NodeList_" + c + "_nodeChunkSize", map.get("nodeChunkSize")); prop.put("NodeList_" + c + "_nodeCacheCount", map.get("nodeCacheCount")); prop.put("NodeList_" + c + "_nodeCacheMem", mem / (1024 * 1024)); @@ -171,8 +169,7 @@ public class PerformanceMemory_p { while (i.hasNext()) { filename = (String) i.next(); map = (Map) kelondroCache.memoryStats(filename); - p = filename.indexOf("DATA"); - prop.put("ObjectList_" + c + "_objectCachePath", filename.substring(p)); + prop.put("ObjectList_" + c + "_objectCachePath", ((p = filename.indexOf("DATA")) < 0) ? filename : filename.substring(p)); // hit cache hitmem = Long.parseLong((String) map.get("objectHitMem"));