Merge branch '2.14' into feature/db-3405-datatypefeature

FasterXML · Mar 19, 2022 · e5a206d · e5a206d
2 parents 494802b + 594f580
commit e5a206d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -1424,6 +1424,11 @@ Christoph Dreis (dreis2211@github)
   * Suggested #3293: Use Method.getParameterCount() where possible
   (2.13.2)
 
+Matthieu Finiasz (finiasz@github)
+  * Reported #3412: Version 2.13.2 uses `Method.getParameterCount()` which is not
+   supported on Android before API 26
+  (2.13.3)
+
 ZeyuCai@github:
   * Contributed #3314: Four Flaky Tests Detected in 2.14
   (2.14.0)
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -9,6 +9,12 @@ Project: jackson-databind
 #3373: Change `TypeSerializerBase` to skip `generator.writeTypePrefix()`
   for `null` typeId
 
+2.13.3 (not yet released)
+
+#3412: Version 2.13.2 uses `Method.getParameterCount()` which is not
+  supported on Android before API 26
+ (reported by Matthew F)
+
 2.13.2 (06-Mar-2022)
 
 #3293: Use Method.getParameterCount() where possible

diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedMethod.java b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedMethod.java
@@ -125,9 +125,9 @@ public final Object callOnWith(Object pojo, Object... args) throws Exception {
 
     @Override
     public int getParameterCount() {
-        return getRawParameterTypes().length;
+        return _method.getParameterCount();
     }
-    
+
     @Override
     public Class<?> getRawParameterType(int index)
     {