Support negative floating point exponent values in JSONSerializer.

git-svn-id: https://svn.apache.org/repos/asf/pivot/branches/1.5.x@1036009 13f79535-47bb-0310-9956-ffa450edef68
apache · Nov 17, 2010 · d9a2171 · d9a2171
1 parent 6c5deca
commit d9a2171
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/core/src/org/apache/pivot/json/JSONSerializer.java b/core/src/org/apache/pivot/json/JSONSerializer.java
@@ -382,7 +382,7 @@ private Object readNumber(Reader reader, Type type)
         }
 
         while (c != -1 && (Character.isDigit(c) || c == '.'
-            || c == 'e' || c == 'E')) {
+            || c == 'e' || c == 'E' || c == '-')) {
             stringBuilder.append((char)c);
             integer &= !(c == '.');
             c = reader.read();

diff --git a/core/test/org/apache/pivot/json/test/JSONSerializerTest.java b/core/test/org/apache/pivot/json/test/JSONSerializerTest.java
@@ -51,6 +51,12 @@ public void testInvalidNumbers() {
         JSONSerializer.toString(Double.POSITIVE_INFINITY);
     }
 
+    @Test
+    public void testE() throws SerializationException {
+        assertEquals(5000000, JSONSerializer.parseDouble("5.0E6"), 0);
+        assertEquals(0.000005, JSONSerializer.parseDouble("5.0E-6"), 0);
+    }
+
     @Test
     public void testEquals() throws IOException, SerializationException {
         JSONSerializer jsonSerializer = new JSONSerializer();