# HG changeset patch
# User bpb
# Date 1371580599 25200
# Node ID 4b4381313a3c18cc000a49f9d69dd2562df5aabd
# Parent  9749983601cfebdd2f54b8623c5f6793748e3bdd
8015395: NumberFormatException during startup if JDK-internal property java.lang.Integer.IntegerCache.high set to bad value
Summary: Fall back to default if a bad value is passed for this property.
Reviewed-by: mduigou

diff -r 9749983601cf -r 4b4381313a3c jdk/src/share/classes/java/lang/Integer.java
--- a/jdk/src/share/classes/java/lang/Integer.java	Tue Jun 18 17:19:49 2013 +0400
+++ b/jdk/src/share/classes/java/lang/Integer.java	Tue Jun 18 11:36:39 2013 -0700
@@ -788,10 +788,14 @@
             String integerCacheHighPropValue =
                 sun.misc.VM.getSavedProperty("java.lang.Integer.IntegerCache.high");
             if (integerCacheHighPropValue != null) {
-                int i = parseInt(integerCacheHighPropValue);
-                i = Math.max(i, 127);
-                // Maximum array size is Integer.MAX_VALUE
-                h = Math.min(i, Integer.MAX_VALUE - (-low) -1);
+                try {
+                    int i = parseInt(integerCacheHighPropValue);
+                    i = Math.max(i, 127);
+                    // Maximum array size is Integer.MAX_VALUE
+                    h = Math.min(i, Integer.MAX_VALUE - (-low) -1);
+                } catch( NumberFormatException nfe) {
+                    // If the property cannot be parsed into an int, ignore it.
+                }
             }
             high = h;