This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 8c58e3759c Fix back-port
8c58e3759c is described below
commit 8c58e3759c248bbec8c6a907706b53033b562a82
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Nov 12 11:42:36 2026 +0000
Fix back-port
---
java/org/apache/el/parser/AstFunction.java | 2 +-
test/org/apache/el/TesterBeanK.java | 51 ++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/el/parser/AstFunction.java
b/java/org/apache/el/parser/AstFunction.java
index 6d80d7924b..ca55e96600 100644
--- a/java/org/apache/el/parser/AstFunction.java
+++ b/java/org/apache/el/parser/AstFunction.java
@@ -182,7 +182,7 @@ public final class AstFunction extends SimpleNode {
if (isArray(value)) {
params[i] = value;
} else {
- params[i] = new Object[] {
ELSupport.coerceToType(ctx, value,
+ params[i] = new Object[] { coerceToType(ctx,
value,
paramTypes[i].getComponentType()) };
}
} else {
diff --git a/test/org/apache/el/TesterBeanK.java
b/test/org/apache/el/TesterBeanK.java
new file mode 100644
index 0000000000..a65d4b7aa2
--- /dev/null
+++ b/test/org/apache/el/TesterBeanK.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.el;
+
+/*
+ * Counts how often the getter used for the base chain and the method used as
+ * a parameter are evaluated.
+ */
+public class TesterBeanK {
+
+ public int baseCalls = 0;
+ public int argCalls = 0;
+
+ private TesterBeanK child;
+
+
+ public TesterBeanK getChild() {
+ baseCalls++;
+ return child;
+ }
+
+
+ public void setChild(TesterBeanK child) {
+ this.child = child;
+ }
+
+
+ public int next() {
+ argCalls++;
+ return argCalls;
+ }
+
+
+ public String format(int value) {
+ return "formatted-" + value;
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]