Skip to content

Commit b23eccb

Browse files
committed
Fixed #2331
1 parent 52185ab commit b23eccb

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

release-notes/VERSION-2.x

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ Project: jackson-databind
44
=== Releases ===
55
------------------------------------------------------------------------
66

7+
2.10.0.pr2 (not yet released)
8+
9+
#2331: `JsonMappingException` through nested getter with generic wildcard return type
10+
(reported by sunchezz89@github)
11+
712
2.10.0.pr1 (19-Jul-2019)
813

914
#18: Make `JsonNode` serializable

src/main/java/com/fasterxml/jackson/databind/type/ResolvedRecursiveType.java

+10-4
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,20 @@ public void setReference(JavaType ref)
2828

2929
@Override
3030
public JavaType getSuperClass() {
31-
if (_referencedType != null) {
32-
return _referencedType.getSuperClass();
33-
}
34-
return super.getSuperClass();
31+
if (_referencedType != null) {
32+
return _referencedType.getSuperClass();
33+
}
34+
return super.getSuperClass();
3535
}
3636

3737
public JavaType getSelfReferencedType() { return _referencedType; }
3838

39+
// 23-Jul-2019, tatu: [databind#2331] Need to also delegate this...
40+
@Override
41+
public TypeBindings getBindings() {
42+
return _referencedType.getBindings();
43+
}
44+
3945
@Override
4046
public StringBuilder getGenericSignature(StringBuilder sb) {
4147
return _referencedType.getGenericSignature(sb);

src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java

-1
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@ public JavaType constructSpecializedType(JavaType baseType, Class<?> subclass)
363363
if (rawBase == subclass) {
364364
return baseType;
365365
}
366-
367366
JavaType newType;
368367

369368
// also: if we start from untyped, not much to save

0 commit comments

Comments
 (0)