Merge branch '2.10' into 2.11

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -45,6 +45,9 @@ Project: jackson-databind
  (reported by Greg A)
 #2567: Incorrect target type for arrays when providing nulls and nulls are disabled
  (reported by João G)
+#2576: Fail to serialize `Enum` instance which includes a method override
+  as POJO (shape = Shape.OBJECT)
+ (reported by ylhuang-veeva@github)
 
 2.10.1 (09-Nov-2019)
 

src/main/java/com/fasterxml/jackson/databind/ser/BeanSerializerFactory.java

@@ -278,8 +278,8 @@ public JsonSerializer<Object> findBeanOrAddOnSerializer(SerializerProvider prov,
         // First things first: we know some types are not beans...
         if (!isPotentialBeanType(type.getRawClass())) {
             // 03-Aug-2012, tatu: Except we do need to allow serializers for Enums,
-            //   as per [databind#24]
-            if (!type.isEnumType()) {
+            //   as per [databind#24], [databind#2576]
+            if (!ClassUtil.isEnumType(type.getRawClass())) {
                 return null;
             }
         }