Skip to content

Commit b001d14

Browse files
authored
Merge pull request #927 from k163377/fix_dec
Fixed problem of checking twice if it is defined in Kotlin
2 parents 7bcfc36 + 6536a0b commit b001d14

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinAnnotationIntrospector.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,12 @@ internal class KotlinAnnotationIntrospector(
4444
when {
4545
nullToEmptyCollection && m.type.isCollectionLikeType -> false
4646
nullToEmptyMap && m.type.isMapLikeType -> false
47-
m.member.declaringClass.isKotlinClass() -> when (m) {
47+
else -> when (m) {
4848
is AnnotatedField -> m.hasRequiredMarker()
4949
is AnnotatedMethod -> m.hasRequiredMarker()
5050
is AnnotatedParameter -> m.hasRequiredMarker()
5151
else -> null
5252
}
53-
else -> null
5453
}
5554
} catch (_: UnsupportedOperationException) {
5655
null

0 commit comments

Comments
 (0)