Fixes bug #25970 reported by Michael Kay <mike@saxonica.com>

       * java/math/BigDecimal.java (compareTo): Don't strip trailing zeros.
       Add trailing zeros to the fraction of the decimal with the smallest
       scale.

2 files changed, 14 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 3ee7d54d7..9c566f826 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-26  Mark Wielaard  <mark@klomp.org>
+
+	Fixes bug #25970 reported by Michael Kay <mike@saxonica.com>
+	* java/math/BigDecimal.java (compareTo): Don't strip trailing zeros.
+	Add trailing zeros to the fraction of the decimal with the smallest
+	scale.
+
 2006-01-26  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/text/html/ObjectView.java: New file.
diff --git a/java/math/BigDecimal.java b/java/math/BigDecimal.java
index 693c39987..94b373b04 100644
--- a/java/math/BigDecimal.java
+++ b/java/math/BigDecimal.java
@@ -365,16 +365,13 @@ public class BigDecimal extends Number implements Comparable
 
     // quotients are the same, so compare remainders
 
-    // remove trailing zeros
-    if (thisParts[1].equals (BigInteger.valueOf (0)) == false)
-      while (thisParts[1].mod (BigInteger.valueOf (10)).equals
-	     (BigInteger.valueOf (0)))
-      thisParts[1] = thisParts[1].divide (BigInteger.valueOf (10));
-    // again...
-    if (valParts[1].equals(BigInteger.valueOf (0)) == false)
-      while (valParts[1].mod (BigInteger.valueOf (10)).equals
-	     (BigInteger.valueOf (0)))
-	valParts[1] = valParts[1].divide (BigInteger.valueOf (10));
+    // Add some trailing zeros to the remainder with the smallest scale
+    if (scale < val.scale)
+      thisParts[1] = thisParts[1].multiply
+			(BigInteger.valueOf (10).pow (val.scale - scale));
+    else if (scale > val.scale)
+      valParts[1] = valParts[1].multiply
+			(BigInteger.valueOf (10).pow (scale - val.scale));
 
     // and compare them
     return thisParts[1].compareTo (valParts[1]);