* java/lang/Integer.java: Merged with Classpath.

From-SVN: r44478

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index aabca8d60ec4094b661e907fc86ad7d2f02d6cf1..4fda0831d85f8c99bf40d0abc12c1e5057f3a0cc 100644 (file)
--- 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 414d93d43a85c4f61ca2a89669cc13ca513b83ac..8e417e95bbe3a191fe73ef221b3367ed831d9dbb 100644 (file)
--- 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.