Merge pull request #114 from philipa/2.9

copyStructure(): avoid duplicate tags when copying tagged binary.

Author: cowtowncoder

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

@@ -843,6 +843,7 @@ protected JsonToken _handleTaggedBinary(int tag) throws IOException
         }
         _numberBigInt = nr;
         _numTypesValid = NR_BIGINT;
+        _tagValue = -1;
         return (_currToken = JsonToken.VALUE_NUMBER_INT);
     }
 

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/GeneratorSimpleTest.java

@@ -2,6 +2,7 @@
 
 import java.io.*;
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.*;
 
 import org.junit.Assert;
@@ -398,7 +399,7 @@ public void testCopyCurrentEventWithTag() throws Exception {
             targetBytes.toByteArray());
     }
 
-    public void testCopyCurrentSturctureWithTag() throws Exception {
+    public void testCopyCurrentStructureWithTaggedArray() throws Exception {
         final ByteArrayOutputStream sourceBytes = new ByteArrayOutputStream();
         final CBORGenerator sourceGen = cborGenerator(sourceBytes);
         sourceGen.writeNumber(BigDecimal.ONE);
@@ -422,4 +423,24 @@ public void testCopyCurrentSturctureWithTag() throws Exception {
             },
             targetBytes.toByteArray());
     }
+
+
+    public void testCopyCurrentStructureWithTaggedBinary() throws Exception {
+        final ByteArrayOutputStream sourceBytes = new ByteArrayOutputStream();
+        final CBORGenerator sourceGen = cborGenerator(sourceBytes);
+        sourceGen.writeNumber(BigInteger.ZERO);
+        sourceGen.close();
+
+        final ByteArrayOutputStream targetBytes = new ByteArrayOutputStream();
+        final CBORGenerator gen = cborGenerator(targetBytes);
+        final CBORParser cborParser = cborParser(sourceBytes);
+        cborParser.nextToken();
+        gen.copyCurrentStructure(cborParser);
+        gen.close();
+        cborParser.close();
+
+        Assert.assertArrayEquals(
+            sourceBytes.toByteArray(),
+            targetBytes.toByteArray());
+    }
 }