Skip to content

Commit 6f4a608

Browse files
committed
Merge branch '2.12' into 2.13
2 parents c6efc45 + 2644cba commit 6f4a608

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,9 @@ public JacksonInject.Value findInjectableValue(AnnotatedMember m) {
302302
JacksonInject.Value r = _primary.findInjectableValue(m);
303303
if (r == null || r.getUseInput() == null) {
304304
JacksonInject.Value secondary = _secondary.findInjectableValue(m);
305-
r = (r == null || secondary == null) ? secondary : r.withUseInput(secondary.getUseInput());
305+
if (secondary != null) {
306+
r = (r == null) ? secondary : r.withUseInput(secondary.getUseInput());
307+
}
306308
}
307309
return r;
308310
}

0 commit comments

Comments
 (0)