Skip to content

Commit af09e81

Browse files
committed
Rollback PR: #5478
1 parent 91a59bc commit af09e81

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/main/java/tools/jackson/databind/deser/BasicDeserializerFactory.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -766,14 +766,11 @@ public ValueDeserializer<?> createCollectionDeserializer(DeserializationContext
766766
ValueDeserializer<Object> contentDeser = (ValueDeserializer<Object>) contentType.getValueHandler();
767767
final DeserializationConfig config = ctxt.getConfig();
768768

769-
TypeDeserializer contentTypeDeser = null;
770-
if (contentDeser == null) {
771-
// Then optional type info: if type has been resolved, we may already know type deserializer:
772-
contentTypeDeser = (TypeDeserializer) contentType.getTypeHandler();
773-
// but if not, may still be possible to find:
774-
if (contentTypeDeser == null) {
775-
contentTypeDeser = ctxt.findTypeDeserializer(contentType);
776-
}
769+
// Then optional type info: if type has been resolved, we may already know type deserializer:
770+
TypeDeserializer contentTypeDeser = (TypeDeserializer) contentType.getTypeHandler();
771+
// but if not, may still be possible to find:
772+
if (contentTypeDeser == null) {
773+
contentTypeDeser = ctxt.findTypeDeserializer(contentType);
777774
}
778775

779776
// 23-Nov-2010, tatu: Custom deserializer?

0 commit comments

Comments
 (0)