Merge branch '2.4' into 2.5

cowtowncoder · cowtowncoder · commit 2f7a4308f128 · 2015-04-02T12:56:50.000-07:00
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -130,6 +130,7 @@ Project: jackson-databind
 
 #735: (complete fix) @JsonDeserialize on Map with contentUsing custom deserializer overwrites default behavior
  (reported by blackfyre512@github) (regression due to #604)
+$744: Custom deserializer with parent object update fails
 
 2.4.5.1 (26-Mar-2015)
 
diff --git a/src/main/java/com/fasterxml/jackson/databind/ObjectReader.java b/src/main/java/com/fasterxml/jackson/databind/ObjectReader.java
@@ -1549,7 +1549,10 @@ protected JsonDeserializer<Object> _findRootDeserializer(DeserializationContext
         throws JsonMappingException
     {
         if (_rootDeserializer != null) {
-            return _rootDeserializer;
+            // 02-Apr-2015, tatu: Patch for #744 (better fix in 2.5.3)
+            if (valueType != JSON_NODE_TYPE) {
+                return _rootDeserializer;
+            }
         }
 
         // Sanity check: must have actual type...

Original file line number	Diff line number	Diff line change
`@@ -1549,7 +1549,10 @@ protected JsonDeserializer<Object> _findRootDeserializer(DeserializationContext`
`1549`	`1549`	`throws JsonMappingException`
`1550`	`1550`	`{`
`1551`	`1551`	`if (_rootDeserializer != null) {`
`1552`		`- return _rootDeserializer;`
	`1552`	`+ // 02-Apr-2015, tatu: Patch for #744 (better fix in 2.5.3)`
	`1553`	`+ if (valueType != JSON_NODE_TYPE) {`
	`1554`	`+ return _rootDeserializer;`
	`1555`	`+ }`
`1553`	`1556`	`}`
`1554`	`1557`
`1555`	`1558`	`// Sanity check: must have actual type...`