Skip to content

Commit

Permalink
Fix bug in #3146 (#3147)
Browse files Browse the repository at this point in the history
If primary is not null but primary.useInput is null,
and secondary is null, just return primary.
  • Loading branch information
josephlbarnett authored May 7, 2021
1 parent d7de513 commit 2644cba
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,9 @@ public JacksonInject.Value findInjectableValue(AnnotatedMember m) {
JacksonInject.Value r = _primary.findInjectableValue(m);
if (r == null || r.getUseInput() == null) {
JacksonInject.Value secondary = _secondary.findInjectableValue(m);
r = (r == null || secondary == null) ? secondary : r.withUseInput(secondary.getUseInput());
if (secondary != null) {
r = (r == null) ? secondary : r.withUseInput(secondary.getUseInput());
}
}
return r;
}
Expand Down

0 comments on commit 2644cba

Please sign in to comment.