Skip to content

Commit 594f580

Browse files
committed
Merge branch '2.13' into 2.14
2 parents b4d1d00 + 0ede935 commit 594f580

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

release-notes/CREDITS-2.x

+5
Original file line numberDiff line numberDiff line change
@@ -1424,6 +1424,11 @@ Christoph Dreis (dreis2211@github)
14241424
* Suggested #3293: Use Method.getParameterCount() where possible
14251425
(2.13.2)
14261426
1427+
Matthieu Finiasz (finiasz@github)
1428+
* Reported #3412: Version 2.13.2 uses `Method.getParameterCount()` which is not
1429+
supported on Android before API 26
1430+
(2.13.3)
1431+
14271432
ZeyuCai@github:
14281433
* Contributed #3314: Four Flaky Tests Detected in 2.14
14291434
(2.14.0)

release-notes/VERSION-2.x

+6
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ Project: jackson-databind
99
#3373: Change `TypeSerializerBase` to skip `generator.writeTypePrefix()`
1010
for `null` typeId
1111

12+
2.13.3 (not yet released)
13+
14+
#3412: Version 2.13.2 uses `Method.getParameterCount()` which is not
15+
supported on Android before API 26
16+
(reported by Matthew F)
17+
1218
2.13.2 (06-Mar-2022)
1319

1420
#3293: Use Method.getParameterCount() where possible

src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedMethod.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ public final Object callOnWith(Object pojo, Object... args) throws Exception {
125125

126126
@Override
127127
public int getParameterCount() {
128-
return getRawParameterTypes().length;
128+
return _method.getParameterCount();
129129
}
130-
130+
131131
@Override
132132
public Class<?> getRawParameterType(int index)
133133
{

0 commit comments

Comments
 (0)