diff options
Diffstat (limited to 'libjava/java/lang/Integer.java')
-rw-r--r-- | libjava/java/lang/Integer.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libjava/java/lang/Integer.java b/libjava/java/lang/Integer.java index afa42a4..ad53dab 100644 --- a/libjava/java/lang/Integer.java +++ b/libjava/java/lang/Integer.java @@ -176,7 +176,7 @@ public final class Integer extends Number implements Comparable if (val == null) return def; try { - return decode(nm); + return decode(val); } catch (NumberFormatException e) { @@ -364,6 +364,9 @@ public final class Integer extends Number implements Comparable { final int len; + if (str == null) + throw new NumberFormatException (); + if ((len = str.length()) == 0 || radix < Character.MIN_RADIX || radix > Character.MAX_RADIX) throw new NumberFormatException(); |