Merge branch '2.10' into 2.11

Author: cowtowncoder

Diff for: src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java

@@ -1583,6 +1583,8 @@ public JsonToken nextToken() throws IOException
                     || _currToken == JsonToken.END_ARRAY) {
                 // Closing JSON Object/Array? Close matching context
                 _parsingContext = _parsingContext.parentOrCopy();
+            } else {
+                _parsingContext.updateForValue();
             }
             return _currToken;
         }

Diff for: src/main/java/com/fasterxml/jackson/databind/util/TokenBufferReadContext.java

@@ -92,10 +92,14 @@ public static TokenBufferReadContext createRootContext(JsonStreamContext origCon
     }
 
     public TokenBufferReadContext createChildArrayContext() {
+        // For current context there will be one next Array value, first:
+        ++_index;
         return new TokenBufferReadContext(this, TYPE_ARRAY, -1);
     }
 
     public TokenBufferReadContext createChildObjectContext() {
+        // For current context there will be one next Object value, first:
+        ++_index;
         return new TokenBufferReadContext(this, TYPE_OBJECT, -1);
     }
 
@@ -132,4 +136,17 @@ public TokenBufferReadContext parentOrCopy() {
     public void setCurrentName(String name) throws JsonProcessingException {
         _currentName = name;
     }
+
+    /*
+    /**********************************************************
+    /* Extended support for context updates
+    /**********************************************************
+     */
+
+    /**
+     * @since 2.10.1
+     */
+    public void updateForValue() {
+        ++_index;
+    }
 }