diff options
| author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-08 13:45:39 -0700 |
|---|---|---|
| committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-08 13:45:39 -0700 |
| commit | 01f4caeebf0c1ccb5072fb3173fd0037688a8c2f (patch) | |
| tree | 7f58fe5fc08b1dcfbf6cbded94d9b306eedbb217 /src/main/java/com/fasterxml/jackson | |
| parent | 85c9c8544f0c4f01e88241acc1573746df4f755d (diff) | |
| parent | 0ea66a06a70cca0718d4d4dc5b66b1dab4405afb (diff) | |
| download | jackson-databind-01f4caeebf0c1ccb5072fb3173fd0037688a8c2f.tar.gz | |
Merge branch '2.11' into 2.12
Diffstat (limited to 'src/main/java/com/fasterxml/jackson')
| -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); |