Merge pull request #19 from philipa/master

Fix reported location after non-stream input has been parsed.

Author: cowtowncoder

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

@@ -2841,9 +2841,9 @@ private final int _decodeChunkedUTF8_4(int c) throws IOException
 
     protected final boolean loadMore() throws IOException
     {
-        _currInputProcessed += _inputEnd;
-        
         if (_inputStream != null) {
+            _currInputProcessed += _inputEnd;
+
             int count = _inputStream.read(_inputBuffer, 0, _inputBuffer.length);
             if (count > 0) {
                 _inputPtr = 0;

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

@@ -240,6 +240,34 @@ private void _testMedium(int len) throws Exception
         p.close();
     }
 
+    public void testCurrentLocationByteOffset() throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        CBORGenerator gen = cborGenerator(out);
+        gen.writeString("1234567890");
+        gen.writeString("1234567890");
+        gen.close();
+
+        final byte[] b = out.toByteArray();
+
+        JsonParser p = cborParser(b);
+
+        assertToken(JsonToken.VALUE_STRING, p.nextToken());
+        assertEquals(1, p.getCurrentLocation().getByteOffset());
+        p.getText(); // fully read token.
+        assertEquals(11, p.getCurrentLocation().getByteOffset());
+
+        assertToken(JsonToken.VALUE_STRING, p.nextToken());
+        assertEquals(12, p.getCurrentLocation().getByteOffset());
+        p.getText();
+        assertEquals(22, p.getCurrentLocation().getByteOffset());
+
+        assertNull(p.nextToken());
+        assertEquals(22, p.getCurrentLocation().getByteOffset());
+
+        p.close();
+        assertEquals(22, p.getCurrentLocation().getByteOffset());
+    }
+
     public void testLongNonChunkedText() throws Exception
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();