--- old/src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemController.java	2019-12-20 15:39:20.896617596 +0100
+++ new/src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemController.java	2019-12-20 15:39:20.756617223 +0100
@@ -41,9 +41,6 @@
  */
 public interface CgroupSubsystemController {
 
-    public static final long RETVAL_UNLIMITED = -1;
-    public static final long RETVAL_NOT_SUPPORTED = -2;
-    public static final long RETVAL_ERROR = -3;
     public static final String EMPTY_STR = "";
 
     public String path();
@@ -75,7 +72,7 @@
                                                      String param,
                                                      String match,
                                                      Function<String, Long> conversion) {
-        long retval = CgroupSubsystemController.RETVAL_UNLIMITED;
+        long retval = Metrics.LONG_RETVAL_UNLIMITED;
         try {
             Path filePath = Paths.get(controller.path(), param);
             List<String> lines = CgroupUtil.readAllLinesPrivileged(filePath);
@@ -149,10 +146,9 @@
      * @return int[] containing a sorted list of processors or memory nodes
      */
     public static int[] stringRangeToIntArray(String range) {
-        int[] ints = new int[0];
-
-        if (range == null || EMPTY_STR.equals(range)) return ints;
+        if (range == null || EMPTY_STR.equals(range)) return null;
 
+        int[] ints = new int[0];
         ArrayList<Integer> results = new ArrayList<>();
         String strs[] = range.split(",");
         for (String str : strs) {