Backport fix for #141 into 2.12 branch

FasterXML · Jul 8, 2021 · 65942d8 · 65942d8
1 parent 4d6859f
commit 65942d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/CreatorOptimizer.java b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/CreatorOptimizer.java
@@ -71,7 +71,11 @@ public ValueInstantiator createOptimized()
                                 methodType(Object.class, MethodHandle.class, Object[].class)),
                             methodType(Object.class, Object[].class))
                         .getTarget().invokeExact(
-                            argsCreatorHandle.asSpreader(
+                            argsCreatorHandle
+                                // 08-Jul-2021, tatu: backported fix for [modules-base#141]
+                                //   to support varags
+                                .asFixedArity()
+                                .asSpreader(
                                     Object[].class,
                                     argsCreatorHandle.type().parameterCount())
                                 .asType(methodType(Object.class, Object[].class))))

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -12,6 +12,10 @@ Modules:
 === Releases ===
 ------------------------------------------------------------------------
 
+Not yet released
+
+#141: (blackbird) Blackbird fails to deserialize varargs array
+
 2.12.4 (06-Jul-2021)
 
 #131: (afterburner) Failing to serialize `Thread` returned by `Thread.currentThread()`