[tomcat] branch 8.5.x updated: 65959: Serialize Function as String[] rather Class[]

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 811e085  65959: Serialize Function as String[] rather Class[]
811e085 is described below

commit 811e085ef1c42363da70ce8e8d80f3d8bc06d98a
Author: remm <r...@apache.org>
AuthorDate: Tue Mar 22 13:33:16 2022 +0100

    65959: Serialize Function as String[] rather Class[]
    
    This was introduced when cleaning up PR 476
---
 java/org/apache/el/lang/FunctionMapperImpl.java | 2 +-
 webapps/docs/changelog.xml                      | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/el/lang/FunctionMapperImpl.java 
b/java/org/apache/el/lang/FunctionMapperImpl.java
index 6e9deab..78d772e 100644
--- a/java/org/apache/el/lang/FunctionMapperImpl.java
+++ b/java/org/apache/el/lang/FunctionMapperImpl.java
@@ -129,7 +129,7 @@ public class FunctionMapperImpl extends FunctionMapper 
implements
             } else {
                 out.writeUTF(this.m.getDeclaringClass().getName());
                 out.writeUTF(this.m.getName());
-                out.writeObject(this.m.getParameterTypes());
+                
out.writeObject(ReflectionUtil.toTypeNameArray(this.m.getParameterTypes()));
             }
         }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 38dac48..1e601e3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -118,6 +118,13 @@
       </scode>
     </changelog>
   </subsection>
+  <subsection name="Jasper">
+    <changelog>
+      <fix>
+        <bug>65959</bug>: Serialize Function as String[] rather Class[]. (remm)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Web applications">
     <changelog>
       <fix>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org