diff options
author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-30 17:58:32 +0000 |
---|---|---|
committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-30 17:58:32 +0000 |
commit | 0d93d5085f406eea698993c990817e415dd20acc (patch) | |
tree | 44488c0be623333d2c31775482af78f021f1aa5c /libjava | |
parent | 65afc0ec1a409d7e8ca8cc41eb44342dc42eee7a (diff) | |
download | gcc-0d93d5085f406eea698993c990817e415dd20acc.tar.gz |
* java/lang/Integer.java: Merged with Classpath.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44478 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r-- | libjava/ChangeLog | 4 | ||||
-rw-r--r-- | libjava/java/lang/Integer.java | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index aabca8d60ec..4fda0831d85 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2001-07-30 Tom Tromey <tromey@redhat.com> + + * java/lang/Integer.java: Merged with Classpath. + 2001-07-30 Bryce McKinlay <bryce@waitaki.otago.ac.nz> * java/util/GregorianCalendar.java (GregorianCalendar): Call diff --git a/libjava/java/lang/Integer.java b/libjava/java/lang/Integer.java index 414d93d43a8..8e417e95bbe 100644 --- a/libjava/java/lang/Integer.java +++ b/libjava/java/lang/Integer.java @@ -267,10 +267,8 @@ public final class Integer extends Number implements Comparable */ public static String toString(int num, int radix) { - // Use optimized method for the typical case. - if (radix == 10 || - radix < Character.MIN_RADIX || radix > Character.MAX_RADIX) - return toString(num); + if (radix < Character.MIN_RADIX || radix > Character.MAX_RADIX) + radix = 10; // For negative numbers, print out the absolute value w/ a leading '-'. // Use an array large enough for a binary number. |