archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8206243: java -XshowSettings fails if memory.limit_in_bytes overflows LONG.max

Browse source 
Reviewed-by: dholmes, bobv
This commit is contained in:
Thomas Stuefe 2018-07-05 11:56:19 +02:00
parent 0fdb83a54c
commit 1adadc7882
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/java.base/linux/classes/jdk/internal/platform/cgroupv1/SubSystem.java
View file

@ -27,6 +27,7 @@ package jdk.internal.platform.cgroupv1;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.math.BigInteger;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
@ -100,11 +101,20 @@ public class SubSystem {
public static long getLongValue(SubSystem subsystem, String parm) { public static long getLongValue(SubSystem subsystem, String parm) {
String strval = getStringValue(subsystem, parm); String strval = getStringValue(subsystem, parm);
long retval = 0;
if (strval == null) return 0L; if (strval == null) return 0L;
long retval = Long.parseLong(strval); try {
retval = Long.parseLong(strval);
} catch (NumberFormatException e) {
// For some properties (e.g. memory.limit_in_bytes) we may overflow the range of signed long.
// In this case, return Long.max
BigInteger b = new BigInteger(strval);
if (b.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) > 0) {
return Long.MAX_VALUE;
}
}
return retval; return retval;
} }