Skip to content

Commit 4b75cc8

Browse files
committed
Merge branch '2.19'
2 parents eb8c072 + 3f6fbb4 commit 4b75cc8

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/main/java/tools/jackson/databind/introspect/AnnotatedClassResolver.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ public class AnnotatedClassResolver
5656

5757
// Also... JDK types do not have annotations that are of interest to us
5858
// At least JDK container types
59-
_collectAnnotations = (_intr != null) &&
60-
(!ClassUtil.isJDKClass(_class) || !_type.isContainerType());
59+
// 25-Jan-2025, tatu: [databind#4907] not just Container types, all JDK types
60+
_collectAnnotations = (_intr != null) && !ClassUtil.isJDKClass(_class);
6161
}
6262

6363
AnnotatedClassResolver(MapperConfig<?> config, Class<?> cls, MixInResolver r) {
@@ -70,7 +70,7 @@ public class AnnotatedClassResolver
7070
? config.getAnnotationIntrospector() : null;
7171
_primaryMixin = (r == null) ? null : r.findMixInClassFor(_class);
7272

73-
_collectAnnotations = (_intr != null);
73+
_collectAnnotations = (_intr != null) && !ClassUtil.isJDKClass(_class);
7474
}
7575

7676
/*
@@ -151,7 +151,6 @@ AnnotatedClass resolveFully() {
151151
resolveClassAnnotations(superTypes),
152152
_bindings, _mixInResolver,
153153
_collectAnnotations);
154-
155154
}
156155

157156
AnnotatedClass resolveWithoutSuperTypes() {

0 commit comments

Comments
 (0)