Fix #676

FasterXML · May 8, 2015 · c5a5f53 · c5a5f53
1 parent 7577766
commit c5a5f53
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -4,6 +4,11 @@ Project: jackson-databind
 === Releases ===
 ------------------------------------------------------------------------
 
+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

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/DeserializerCache.java b/src/main/java/com/fasterxml/jackson/databind/deser/DeserializerCache.java
@@ -557,7 +557,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;
     }