svn commit: r905078 - in /commons/proper/lang/branches/LANG_2_X/src: main/java/org/apache/commons/lang/builder/EqualsBuilder.java test/java/org/apache/commons/lang/builder/EqualsBuilderTest.java

[niallp]

Author: niallp
Date: Sun Jan 31 17:24:49 2010
New Revision: 905078

URL: http://svn.apache.org/viewvc?rev=905078&view=rev
Log:
Port LANG-467 to 2.x branch - Rolling back r611543 for LANG-393, and removing 
the special handling of BigDecimal to use compareTo instead of equals because 
it creates an inequality with HashCodeBuilder

Modified:
    
commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/EqualsBuilder.java
    
commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/builder/EqualsBuilderTest.java

Modified: 
commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/EqualsBuilder.java
URL: 
http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/EqualsBuilder.java?rev=905078&r1=905077&r2=905078&view=diff
==============================================================================
--- 
commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/EqualsBuilder.java
 (original)
+++ 
commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/EqualsBuilder.java
 Sun Jan 31 17:24:49 2010
@@ -375,12 +375,8 @@
         }
         Class lhsClass = lhs.getClass();
         if (!lhsClass.isArray()) {
-            if (lhs instanceof java.math.BigDecimal && rhs instanceof 
java.math.BigDecimal) {
-                isEquals = 
(((java.math.BigDecimal)lhs).compareTo((java.math.BigDecimal)rhs) == 0);
-            } else {
-                // The simple case, not an array, just test the element
-                isEquals = lhs.equals(rhs);
-            }
+            // The simple case, not an array, just test the element
+            isEquals = lhs.equals(rhs);
         } else if (lhs.getClass() != rhs.getClass()) {
             // Here when we compare different dimensions, for example: a 
boolean[][] to a boolean[] 
             this.setEquals(false);

Modified: 
commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/builder/EqualsBuilderTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/builder/EqualsBuilderTest.java?rev=905078&r1=905077&r2=905078&view=diff
==============================================================================
--- 
commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/builder/EqualsBuilderTest.java
 (original)
+++ 
commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/builder/EqualsBuilderTest.java
 Sun Jan 31 17:24:49 2010
@@ -377,14 +377,6 @@
         assertTrue(new EqualsBuilder().append(Float.POSITIVE_INFINITY, 
Float.POSITIVE_INFINITY).isEquals());
     }
 
-    // https://issues.apache.org/jira/browse/LANG-393
-    public void testBigDecimal() {
-        BigDecimal o1 = new BigDecimal("2.0");
-        BigDecimal o2 = new BigDecimal("2.00");
-        assertTrue(new EqualsBuilder().append(o1, o1).isEquals());
-        assertTrue(new EqualsBuilder().append(o1, o2).isEquals());
-    }
-
     public void testAccessors() {
         EqualsBuilder equalsBuilder = new EqualsBuilder();
         assertTrue(equalsBuilder.isEquals());