Fix jsonNode#addAll (#2443)

Fix #2442: ArrayNode.addAll() needs to handle `null` entries
FasterXML · Sep 6, 2019 · 11dfe14 · 11dfe14
1 parent cb69a70
commit 11dfe14
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/main/java/com/fasterxml/jackson/databind/node/ArrayNode.java b/src/main/java/com/fasterxml/jackson/databind/node/ArrayNode.java
@@ -316,7 +316,9 @@ public ArrayNode addAll(ArrayNode other)
      */
     public ArrayNode addAll(Collection<? extends JsonNode> nodes)
     {
-        _children.addAll(nodes);
+        for (JsonNode node : nodes) {
+            add(node);
+        }
         return this;
     }
 

diff --git a/src/test/java/com/fasterxml/jackson/databind/node/ArrayNodeTest.java b/src/test/java/com/fasterxml/jackson/databind/node/ArrayNodeTest.java
@@ -12,6 +12,7 @@
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.fasterxml.jackson.databind.node.TreeTraversingParser;
+import static java.util.Arrays.asList;
 
 /**
  * Additional tests for {@link ArrayNode} container class.
@@ -186,6 +187,23 @@ public void testNullAdds()
         }
     }
 
+    public void testAddAllWithNullInCollection()
+    {
+        // preparation
+        final ArrayNode array = JsonNodeFactory.instance.arrayNode();
+
+        // test
+        array.addAll(asList(null, JsonNodeFactory.instance.objectNode()));
+
+        // assertions
+        assertEquals(2, array.size());
+
+        for (JsonNode node : array) {
+            assertFalse(node.isNull());
+        }
+        assertEquals(NullNode.getInstance(), array.get(0));
+    }
+
     public void testNullInserts()
     {
         JsonNodeFactory f = objectMapper().getNodeFactory();