diff options
| author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-08 13:42:56 -0700 |
|---|---|---|
| committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-08 13:42:56 -0700 |
| commit | 0ea66a06a70cca0718d4d4dc5b66b1dab4405afb (patch) | |
| tree | f32097978d325cd286bae371fe45c6b5187be718 /src/main/java/com/fasterxml | |
| parent | 5e941f6f534b4a000fb93017734eb1f2e2a51703 (diff) | |
| parent | eeac38b29b8bb011f1741fdd2253c71a7635a88c (diff) | |
| download | jackson-databind-0ea66a06a70cca0718d4d4dc5b66b1dab4405afb.tar.gz | |
Merge branch '2.10' into 2.11
Diffstat (limited to 'src/main/java/com/fasterxml')
| -rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedFieldCollector.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedFieldCollector.java b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedFieldCollector.java index 2c45507a9..d5403cc69 100644 --- a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedFieldCollector.java +++ b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedFieldCollector.java @@ -88,7 +88,7 @@ public class AnnotatedFieldCollector fields.put(f.getName(), b); } // And then... any mix-in overrides? - if (_mixInResolver != null) { + if ((fields != null) && (_mixInResolver != null)) { Class<?> mixin = _mixInResolver.findMixInClassFor(cls); if (mixin != null) { _addFieldMixIns(mixin, cls, fields); |