commit a699637ef310fdd430add25655f1fddfd48c62aa
author Tatu Saloranta <tatu.saloranta@iki.fi> Fri Apr 21 21:52:51 2017 -0700
committer Tatu Saloranta <tatu.saloranta@iki.fi> Fri Apr 21 21:52:51 2017 -0700
tree 73040c11c70abb066fdbad74064ebc1c2255227b
parent eeda3ffe7d30ee5a2b59d3210c2b415127562514

tiny change to merging of JsonNodes

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

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java
index 0ecc905..ca62033 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java
@@ -364,25 +364,27 @@
             JsonToken t = p.nextToken();
 
             // First: see if we can merge things:
-            JsonNode value = node.get(key);
-            if (value != null) {
-                if (value instanceof ObjectNode) {
-                    JsonNode newValue = updateObject(p, ctxt, (ObjectNode) value);
-                    if (newValue != null) {
+            JsonNode old = node.get(key);
+            if (old != null) {
+                if (old instanceof ObjectNode) {
+                    JsonNode newValue = updateObject(p, ctxt, (ObjectNode) old);
+                    if (newValue != old) {
                         node.set(key, newValue);
-                        continue;
                     }
-                } else if (value instanceof ArrayNode) {
-                    JsonNode newValue = updateArray(p, ctxt, (ArrayNode) value);
-                    if (newValue != null) {
+                    continue;
+                }
+                if (old instanceof ArrayNode) {
+                    JsonNode newValue = updateArray(p, ctxt, (ArrayNode) old);
+                    if (newValue != old) {
                         node.set(key, newValue);
-                        continue;
                     }
+                    continue;
                 }
             }
             if (t == null) { // can this ever occur?
-                t = JsonToken.NOT_AVAILABLE; // can this ever occur?
+                t = JsonToken.NOT_AVAILABLE;
             }
+            JsonNode value;
             JsonNodeFactory nodeFactory = ctxt.getNodeFactory();
             switch (t.id()) {
             case JsonTokenId.ID_START_OBJECT:
@@ -412,11 +414,11 @@
             default:
                 value = deserializeAny(p, ctxt, nodeFactory);
             }
-            JsonNode old = node.replace(key, value);
             if (old != null) {
                 _handleDuplicateField(p, ctxt, nodeFactory,
                         key, node, old, value);
             }
+            node.set(key, value);
         }
         return node;
     }