prune temp 2.4.6-only fix for #744 after merge

cowtowncoder · cowtowncoder · commit fa1c2ff7eefd · 2015-04-02T12:57:30.000-07:00
diff --git a/src/main/java/com/fasterxml/jackson/databind/ObjectReader.java b/src/main/java/com/fasterxml/jackson/databind/ObjectReader.java
@@ -1549,10 +1549,7 @@ protected JsonDeserializer<Object> _findRootDeserializer(DeserializationContext
         throws JsonMappingException
     {
         if (_rootDeserializer != null) {
-            // 02-Apr-2015, tatu: Patch for #744 (better fix in 2.5.3)
-            if (valueType != JSON_NODE_TYPE) {
-                return _rootDeserializer;
-            }
+            return _rootDeserializer;
         }
 
         // Sanity check: must have actual type...

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