Skip to content

Commit 3aee590

Browse files
committed
Fix #1052
1 parent 7ed2d00 commit 3aee590

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

release-notes/VERSION

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Project: jackson-databind
66

77
2.6.5 (not yet released)
88

9+
#1052: Don't generate a spurious NullNode after parsing an embedded object
10+
(reported by philipa@github)
911
#1061: Problem with Object Id and Type Id as Wrapper Object (regression in 2.5.1)
1012

1113
2.6.4 (07-Dec-2015)

src/main/java/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java

+1
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ protected final ArrayNode deserializeArray(JsonParser p, DeserializationContext
276276
return node;
277277
case JsonTokenId.ID_EMBEDDED_OBJECT:
278278
node.add(_fromEmbedded(p, ctxt, nodeFactory));
279+
break;
279280
case JsonTokenId.ID_STRING:
280281
node.add(nodeFactory.textNode(p.getText()));
281282
break;

0 commit comments

Comments
 (0)