commit 7a99d80166e78c92ef5ccf5a609753613ecac470
author Neil Fuller <nfuller@google.com> Mon Sep 28 11:03:27 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 28 11:03:27 2015 +0000
tree 6f13a36922a51c91bb641245bc2449aa5418f82b
parent 34489adf319727847824a9e625df8fc4e7ad77f4
parent 01ce21dbd1c816340ec7b68f42f9fcddb6916a58

Merge "Revert "Fix Double.toString() for a tie case""

luni/src/main/java/java/lang/RealToString.java

diff --git a/luni/src/main/java/java/lang/RealToString.java b/luni/src/main/java/java/lang/RealToString.java
index e5cd5bc..31203eb 100644
--- a/luni/src/main/java/java/lang/RealToString.java
+++ b/luni/src/main/java/java/lang/RealToString.java
@@ -311,7 +311,7 @@
             digits[digitCount++] = U;
         } else if (high && !low) {
             digits[digitCount++] = U + 1;
-        } else if ((R << 1) <= S) {
+        } else if ((R << 1) < S) {
             digits[digitCount++] = U;
         } else {
             digits[digitCount++] = U + 1;

luni/src/test/java/libcore/java/lang/DoubleTest.java

diff --git a/luni/src/test/java/libcore/java/lang/DoubleTest.java b/luni/src/test/java/libcore/java/lang/DoubleTest.java
index f989c06..85281ba 100644
--- a/luni/src/test/java/libcore/java/lang/DoubleTest.java
+++ b/luni/src/test/java/libcore/java/lang/DoubleTest.java
@@ -30,19 +30,6 @@
         assertEquals("0.010206713752229896", Double.toString(0.010206713752229896));
     }
 
-    // http://b/24195419
-    public void testDoubleToStringTie() throws Exception {
-        double d = 242.60000610351562;
-        assertEquals(0x406E533340000000L, Double.doubleToLongBits(d));
-
-        double d2 = 242.60000610351563;
-        assertEquals(Double.doubleToLongBits(d), Double.doubleToLongBits(d2));
-
-        // There is a tie between 242.60000610351562 and 242.60000610351563 on the final decimal
-        // digit. Testing suggests toString() should produce "242.60000610351562".
-        assertEquals("242.60000610351562", Double.toString(d));
-    }
-
     public void testNamedDoubles() throws Exception {
         assertEquals(Double.NaN, Double.parseDouble("NaN"));
         assertEquals(Double.NaN, Double.parseDouble("-NaN"));