From eeac38b29b8bb011f1741fdd2253c71a7635a88c Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 8 Jul 2020 13:40:40 -0700 Subject: Add a test for #2787, partial fix (no more NPE, now fails otherwise) --- .../fasterxml/jackson/databind/introspect/AnnotatedFieldCollector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/com') 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 0dba88bba..202d63e34 100644 --- a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedFieldCollector.java +++ b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedFieldCollector.java @@ -81,7 +81,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); -- cgit v1.2.3