aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2001-07-30 17:58:32 +0000
committerTom Tromey <tromey@gcc.gnu.org>2001-07-30 17:58:32 +0000
commitd76cbbc844a6f08555965f384c094f0626da8d3d (patch)
tree44488c0be623333d2c31775482af78f021f1aa5c /libjava
parent8597f3dd894c734199e80e6660c7f3bf0b47b81a (diff)
downloadgcc-d76cbbc844a6f08555965f384c094f0626da8d3d.zip
gcc-d76cbbc844a6f08555965f384c094f0626da8d3d.tar.gz
gcc-d76cbbc844a6f08555965f384c094f0626da8d3d.tar.bz2
* java/lang/Integer.java: Merged with Classpath.
From-SVN: r44478
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog4
-rw-r--r--libjava/java/lang/Integer.java6
2 files changed, 6 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index aabca8d..4fda083 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 414d93d..8e417e9 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.