diff options
author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-21 17:16:43 -0700 |
---|---|---|
committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-21 17:16:43 -0700 |
commit | 461cd4db9bf02691b1e546dc1d23794501d8cc74 (patch) | |
tree | 60a92a4c1e271acabe0300fcdd469b03cd57e9bd /src | |
parent | 7d7f510cf34ffcec13be7b167b57250d1bacfcec (diff) | |
parent | 910edfb634f55cdb8d78ac7d9caf00d8133a11e6 (diff) | |
download | jackson-databind-461cd4db9bf02691b1e546dc1d23794501d8cc74.tar.gz |
Merge branch '2.11' into 2.12
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/introspect/TypeResolutionContext.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/TypeResolutionContext.java b/src/main/java/com/fasterxml/jackson/databind/introspect/TypeResolutionContext.java index d0e86bdfd..405a5e9c2 100644 --- a/src/main/java/com/fasterxml/jackson/databind/introspect/TypeResolutionContext.java +++ b/src/main/java/com/fasterxml/jackson/databind/introspect/TypeResolutionContext.java @@ -28,7 +28,20 @@ public interface TypeResolutionContext { @Override public JavaType resolveType(Type type) { + // 15-Jun-2020, tatu: As a consequence of [databind#2796], need to + // AVOID passing bindings for raw, type-erased cases, as otherwise + // we seem to get odd "generic Long" cases (for Mr Bean module at least) + if (type instanceof Class<?>) { + return _typeFactory.constructType(type); + } return _typeFactory.constructType(type, _bindings); } + + /*// debugging + @Override + public String toString() { + return "[TRC.Basic, bindings: "+_bindings+"]"; + } + */ } } |