--- old/src/java.base/share/classes/sun/launcher/LauncherHelper.java	2020-02-11 18:28:03.492497521 +0100
+++ new/src/java.base/share/classes/sun/launcher/LauncherHelper.java	2020-02-11 18:28:03.350497051 +0100
@@ -119,6 +119,7 @@
 
     private static final String defaultBundleName =
             "sun.launcher.resources.launcher";
+    private static final long LONG_RETVAL_NOT_SUPPORTED = -2;
     private static class ResourceBundleHolder {
         private static final ResourceBundle RB =
                 ResourceBundle.getBundle(defaultBundleName);
@@ -393,9 +394,6 @@
             ostream.println(INDENT + "List of Available Memory Nodes: N/A");
         }
 
-        ostream.println(formatBoolean(c.isCpuSetMemoryPressureEnabled(),
-                                      INDENT + "CPUSet Memory Pressure Enabled: "));
-
         long limit = c.getMemoryLimit();
         ostream.println(formatLimitString(limit, INDENT + "Memory Limit: "));
 
@@ -405,22 +403,13 @@
         limit = c.getMemoryAndSwapLimit();
         ostream.println(formatLimitString(limit, INDENT + "Memory & Swap Limit: "));
 
-        limit = c.getKernelMemoryLimit();
-        ostream.println(formatLimitString(limit, INDENT + "Kernel Memory Limit: "));
-
-        limit = c.getTcpMemoryLimit();
-        ostream.println(formatLimitString(limit, INDENT + "TCP Memory Limit: "));
-
-        ostream.println(formatBoolean(c.isMemoryOOMKillEnabled(),
-                                      INDENT + "Out Of Memory Killer Enabled: "));
-
         ostream.println("");
     }
 
     private static String formatLimitString(long limit, String prefix) {
         if (limit >= 0) {
             return prefix + SizePrefix.scaleValue(limit);
-        } else if (limit == Metrics.LONG_RETVAL_NOT_SUPPORTED) {
+        } else if (limit == LONG_RETVAL_NOT_SUPPORTED) {
             return prefix + "N/A";
         } else {
             return prefix + "Unlimited";
@@ -430,7 +419,7 @@
     private static String formatCpuVal(long cpuVal, String prefix) {
         if (cpuVal >= 0) {
             return prefix + cpuVal + "us";
-        } else if (cpuVal == Metrics.LONG_RETVAL_NOT_SUPPORTED) {
+        } else if (cpuVal == LONG_RETVAL_NOT_SUPPORTED) {
             return prefix + "N/A";
         } else {
             return prefix + cpuVal;
@@ -438,10 +427,10 @@
     }
 
     private static String formatBoolean(Boolean value, String prefix) {
-        if (value == Metrics.BOOL_RETVAL_NOT_SUPPORTED) {
-            return prefix + "N/A";
-        } else {
+        if (value != null) {
             return prefix + value;
+        } else {
+            return prefix + "N/A";
         }
     }