Merge branch '2.7'

FasterXML · May 27, 2016 · e98a273 · e98a273
2 parents 4b95df1 + 8daddc0
commit e98a273
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -60,6 +60,7 @@ Project: jackson-databind
  (reported by Mark W)
 #1248: `Annotated` returns raw type in place of Generic Type in 2.7.x
  (reported by Andrew J, apjoseph@github)
+#1253: Problem with context handling for `TokenBuffer`, field name
 
 2.7.4 (29-Apr-2016)
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java b/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java
@@ -623,6 +623,7 @@ public void close() throws IOException {
     @Override
     public final void writeStartArray() throws IOException
     {
+        _writeContext.writeValue();
         _append(JsonToken.START_ARRAY);
         _writeContext = _writeContext.createChildArrayContext();
     }
@@ -641,6 +642,7 @@ public final void writeEndArray() throws IOException
     @Override
     public final void writeStartObject() throws IOException
     {
+        _writeContext.writeValue();
         _append(JsonToken.START_OBJECT);
         _writeContext = _writeContext.createChildObjectContext();
     }
@@ -670,15 +672,15 @@ public final void writeEndObject() throws IOException
     @Override
     public final void writeFieldName(String name) throws IOException
     {
-        _append(JsonToken.FIELD_NAME, name);
         _writeContext.writeFieldName(name);
+        _append(JsonToken.FIELD_NAME, name);
     }
 
     @Override
     public void writeFieldName(SerializableString name) throws IOException
     {
-        _append(JsonToken.FIELD_NAME, name);
         _writeContext.writeFieldName(name.getValue());
+        _append(JsonToken.FIELD_NAME, name);
     }
 
     /*