Skip to content

Commit 39e0ef9

Browse files
committed
Merge branch '2.19'
2 parents dd9c4f9 + 67264fb commit 39e0ef9

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,10 +1206,9 @@ public KeyDeserializer createKeyDeserializer(DeserializationContext ctxt,
12061206
JavaType type)
12071207
{
12081208
final DeserializationConfig config = ctxt.getConfig();
1209-
BeanDescription beanDesc = null;
1209+
final BeanDescription beanDesc = ctxt.introspectBeanDescription(type);
12101210
KeyDeserializer deser = null;
12111211
if (_factoryConfig.hasKeyDeserializers()) {
1212-
beanDesc = ctxt.introspectBeanDescription(type);
12131212
for (KeyDeserializers d : _factoryConfig.keyDeserializers()) {
12141213
deser = d.findKeyDeserializer(type, config, beanDesc);
12151214
if (deser != null) {
@@ -1221,9 +1220,6 @@ public KeyDeserializer createKeyDeserializer(DeserializationContext ctxt,
12211220
// the only non-standard thing is this:
12221221
if (deser == null) {
12231222
// [databind#2452]: Support `@JsonDeserialize(keyUsing = ...)`
1224-
if (beanDesc == null) {
1225-
beanDesc = ctxt.introspectBeanDescription(type);
1226-
}
12271223
deser = findKeyDeserializerFromAnnotation(ctxt, beanDesc.getClassInfo());
12281224
if (deser == null) {
12291225
if (type.isEnumType()) {

0 commit comments

Comments
 (0)