stop using DoubleFormatter

* also, update expected results in those places where
  slight differences in Double formatting was seen.

2 files changed, 6 insertions, 8 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/data/access/simple/JsonRender.java b/vespajlib/src/main/java/com/yahoo/data/access/simple/JsonRender.java
index bc4543011b3..53be6a82dd2 100644
--- a/vespajlib/src/main/java/com/yahoo/data/access/simple/JsonRender.java
+++ b/vespajlib/src/main/java/com/yahoo/data/access/simple/JsonRender.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.data.access.simple;
 
-import com.yahoo.text.DoubleFormatter;
 import com.yahoo.data.access.*;
 
 /**
@@ -52,10 +51,10 @@ public final class JsonRender
         }
 
         private void encodeDOUBLE(double value) {
-            if (Double.isNaN(value) || Double.isInfinite(value)) {
-                out.append("null");
+            if (Double.isFinite(value)) {
+                out.append(String.valueOf(value));
             } else {
-                out.append(DoubleFormatter.stringValue(value));
+                out.append("null");
             }
         }
 
diff --git a/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java b/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java
index d908359df19..c4c82609df7 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java
@@ -6,7 +6,6 @@ import com.yahoo.io.ByteWriter;
 import com.yahoo.text.AbstractUtf8Array;
 import com.yahoo.text.Utf8;
 import com.yahoo.text.Utf8String;
-import com.yahoo.text.DoubleFormatter;
 
 import java.io.*;
 
@@ -107,10 +106,10 @@ public final class JsonFormat implements SlimeFormat
         }
 
         private void encodeDOUBLE(double value) throws IOException {
-            if (Double.isNaN(value) || Double.isInfinite(value)) {
-                out.write(NULL);
+            if (Double.isFinite(value)) {
+                out.write(String.valueOf(value));
             } else {
-                out.write(DoubleFormatter.stringValue(value));
+                out.write(NULL);
             }
         }