echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Summary bar: Bounds check on memory info

Browse Source
This commit is contained in:
zzz
2018-01-10 20:36:15 +00:00
parent 8d6d1bc751
commit c6c61c9e57
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java
View File

@ -315,6 +315,8 @@ public class SummaryHelper extends HelperBase {
} }
used /= 1024*1024; used /= 1024*1024;
long total = tot / (1024*1024); long total = tot / (1024*1024);
if (used > total)
used = total;
// long free = Runtime.getRuntime().freeMemory()/1024/1024; // long free = Runtime.getRuntime().freeMemory()/1024/1024;
// return integerFormatter.format(used) + "MB (" + usedPc + "%)"; // return integerFormatter.format(used) + "MB (" + usedPc + "%)";
// return integerFormatter.format(used) + "MB / " + free + " MB"; // return integerFormatter.format(used) + "MB / " + free + " MB";
@ -339,6 +341,10 @@ public class SummaryHelper extends HelperBase {
used /= 1024*1024; used /= 1024*1024;
} }
long total = tot / (1024*1024); long total = tot / (1024*1024);
if (used > total)
used = total;
if (usedPc > 100)
usedPc = 100;
// long free = Runtime.getRuntime().freeMemory()/1024/1024; // long free = Runtime.getRuntime().freeMemory()/1024/1024;
// return integerFormatter.format(used) + "MB (" + usedPc + "%)"; // return integerFormatter.format(used) + "MB (" + usedPc + "%)";
// return integerFormatter.format(used) + "MB / " + free + " MB"; // return integerFormatter.format(used) + "MB / " + free + " MB";