Fix #31

Author: cowtowncoder

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORGenerator.java

@@ -675,7 +675,6 @@ private final void _writeNumberNoCheck(long l) throws IOException {
     }
 
     private final void _writeNumberNoCheck(double d) throws IOException {
-        _verifyValueWrite("write number");
         _ensureRoomForOutput(11);
         // 17-Apr-2010, tatu: could also use 'doubleToIntBits', but it seems
         // more accurate to use exact representation; and possibly faster.
@@ -1074,7 +1073,7 @@ protected final void _verifyValueWrite(String typeMsg) throws IOException {
             --count;
 
             // 28-Jun-2016, tatu: _Should_ check overrun immediately (instead of waiting
-            //    for end of Object/Array), but has 10% performane penalty for some reason,
+            //    for end of Object/Array), but has 10% performance penalty for some reason,
             //    should figure out why and how to avoid
             if (count < 0) {
                 _failSizedArrayOrObject();

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/mapper/NumberBeanTest.java

@@ -0,0 +1,76 @@
+package com.fasterxml.jackson.dataformat.cbor.mapper;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.cbor.CBORTestBase;
+
+public class NumberBeanTest extends CBORTestBase
+{
+    static class IntsWrapper {
+        public int[][] values;
+
+        protected IntsWrapper() { }
+        public IntsWrapper(int[][] v) { values = v; }
+    }
+
+    static class LongsWrapper {
+        public long[][] values;
+
+        protected LongsWrapper() { }
+        public LongsWrapper(long[][] v) { values = v; }
+    }
+    
+    static class DoublesWrapper {
+        public double[][] values;
+
+        protected DoublesWrapper() { }
+        public DoublesWrapper(double[][] v) { values = v; }
+    }
+
+    /*
+    /**********************************************************
+    /* Test methods
+    /**********************************************************
+     */
+
+    private final ObjectMapper MAPPER = cborMapper();
+
+    public void testIntArrayRoundTrip() throws Exception
+    {
+        int[][] inputArray = new int[][]{ { -5, 3 } };
+        byte[] cbor = MAPPER.writeValueAsBytes(new IntsWrapper(inputArray));
+        IntsWrapper result = MAPPER.readValue(cbor, IntsWrapper.class);
+        assertNotNull(result);
+        assertNotNull(result.values);
+        assertEquals(1, result.values.length);
+        assertEquals(2, result.values[0].length);
+        assertEquals(inputArray[0][0], result.values[0][0]);
+        assertEquals(inputArray[0][1], result.values[0][1]);
+    }
+
+    public void testLongArrayRoundTrip() throws Exception
+    {
+        long[][] inputArray = new long[][]{ { 3L + Integer.MAX_VALUE, -3L + Integer.MIN_VALUE } };
+        byte[] cbor = MAPPER.writeValueAsBytes(new LongsWrapper(inputArray));
+        LongsWrapper result = MAPPER.readValue(cbor, LongsWrapper.class);
+        assertNotNull(result);
+        assertNotNull(result.values);
+        assertEquals(1, result.values.length);
+        assertEquals(2, result.values[0].length);
+        assertEquals(inputArray[0][0], result.values[0][0]);
+        assertEquals(inputArray[0][1], result.values[0][1]);
+    }
+    
+    // for [dataformats-binary#31]
+    public void testDoubleArrayRoundTrip() throws Exception
+    {
+        double[][] inputArray = new double[][]{ { 0.25, -1.5 } };
+        byte[] cbor = MAPPER.writeValueAsBytes(new DoublesWrapper(inputArray));
+        DoublesWrapper result = MAPPER.readValue(cbor, DoublesWrapper.class);
+        assertNotNull(result);
+        assertNotNull(result.values);
+        assertEquals(1, result.values.length);
+        assertEquals(2, result.values[0].length);
+        assertEquals(inputArray[0][0], result.values[0][0]);
+        assertEquals(inputArray[0][1], result.values[0][1]);
+    }
+}

release-notes/VERSION

@@ -9,18 +9,24 @@ Modules:
 === Releases ===
 ------------------------------------------------------------------------
 
+2.9.0 (not yet released)
+
+2.8.5 (not yet released)
+
+#31 (cbor): Exception serializing double[][]
+
 2.8.4 (14-Oct-2016)
 
 No changes since 2.8.3
 
 2.8.3 (17-Sep-2016)
 
-#28: Java float deserialized as `DoubleNode` instance
+#28 (avro): Java float deserialized as `DoubleNode` instance
  (reported by teabot@github)
 
 2.8.2 (30-Aug-2016)
 
-#27: (protobuf) Fixed long deserialization problem for longs of ~13digit length
+#27 (protobuf): Fixed long deserialization problem for longs of ~13digit length
  (contributed by Michael Z)
 
 2.8.1 (20-Jul-2016)

smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/NumberBeanTest.java

@@ -0,0 +1,30 @@
+package com.fasterxml.jackson.dataformat.smile.mapper;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
+
+public class NumberBeanTest extends BaseTestForSmile
+{
+    static class DoublesWrapper {
+        public double[][] values;
+
+        protected DoublesWrapper() { }
+        public DoublesWrapper(double[][] v) { values = v; }
+    }
+
+    private final ObjectMapper MAPPER = smileMapper();
+
+    // for [dataformats-binary#31]
+    public void testDoubleArrayRoundTrip() throws Exception
+    {
+        double[][] inputArray = new double[][]{ { 0.25, -1.5 } };
+        byte[] cbor = MAPPER.writeValueAsBytes(new DoublesWrapper(inputArray));
+        DoublesWrapper result = MAPPER.readValue(cbor, DoublesWrapper.class);
+        assertNotNull(result);
+        assertNotNull(result.values);
+        assertEquals(1, result.values.length);
+        assertEquals(2, result.values[0].length);
+        assertEquals(inputArray[0][0], result.values[0][0]);
+        assertEquals(inputArray[0][1], result.values[0][1]);
+    }
+}