Merge branch '2.4' into 2.5

Conflicts: pom.xml release-notes/VERSION
FasterXML · May 8, 2015 · bcda406 · bcda406
2 parents b02bf06 + c5a5f53
commit bcda406
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -140,7 +140,12 @@ Project: jackson-databind
 - Added new overload for `JsonSerializer.isEmpty()`, to eventually solve #588
 - Improve error messaging (related to [jaxb-annotations#38]) to include known subtype ids.
 
-2.4.6 (not yet released)
+2.4.7 (not yet released)
+
+#676: Deserialization of class with generic collection inside depends on
+  how is was deserialized first time
+
+2.4.6 (23-Apr-2015)
 
 #735: (complete fix) @JsonDeserialize on Map with contentUsing custom deserializer overwrites default behavior
  (reported by blackfyre512@github) (regression due to #604)

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/DeserializerCache.java b/src/main/java/com/fasterxml/jackson/databind/deser/DeserializerCache.java
@@ -563,7 +563,9 @@ private JavaType modifyTypeByAnnotation(DeserializationContext ctxt,
     private boolean _hasCustomValueHandler(JavaType t) {
         if (t.isContainerType()) {
             JavaType ct = t.getContentType();
-            return (ct != null) && (ct.getValueHandler() != null);
+            if (ct != null) {
+                return (ct.getValueHandler() != null) || (ct.getTypeHandler() != null);
+            }
         }
         return false;
     }