Skip to content

Fix BZ 70297 - Evaluate a single EL function varargs argument once #1130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mykolap wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −3
Open

Fix BZ 70297 - Evaluate a single EL function varargs argument once #1130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions java/org/apache/el/parser/AstFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,16 @@ public Object getValue(EvaluationContext ctx) throws ELException {
// Java semantics: an empty array is passed when no
// varargs elements are supplied
params[i] = new Object[0];
} else if (inputParameterCount == methodParameterCount &&
isArray(parameters.jjtGetChild(i).getValue(ctx))) {
params[i] = parameters.jjtGetChild(i).getValue(ctx);
} else if (inputParameterCount == methodParameterCount) {
// Evaluate the single argument once: it is either
// the varargs array itself or its only element
Object value = parameters.jjtGetChild(i).getValue(ctx);
if (isArray(value)) {
params[i] = value;
} else {
params[i] = new Object[] { ELSupport.coerceToType(ctx, value,
paramTypes[i].getComponentType()) };
}
} else {
Object[] varargs = new Object[inputParameterCount - methodParameterCount + 1];
Class<?> target = paramTypes[i].getComponentType();
Expand Down
14 changes: 14 additions & 0 deletions test/org/apache/el/parser/TestAstFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.junit.Assert;
import org.junit.Test;

import org.apache.el.TesterBeanK;
import org.apache.el.TesterFunctions;

public class TestAstFunction {
Expand Down Expand Up @@ -108,6 +109,19 @@ public void testVarargMethod() throws NoSuchMethodException, SecurityException {
Assert.assertEquals("one", result);
}

@Test
public void testVarargMethodSingleArgumentEvaluatedOnce() throws NoSuchMethodException {
// The argument that alone fills the varargs parameter must be evaluated
// exactly once, as each argument is when there are several
ELProcessor processor = new ELProcessor();
TesterBeanK bean = new TesterBeanK();
processor.defineBean("beanK", bean);
processor.defineFunction("fn", "format", String.class.getMethod("format", String.class, Object[].class));

Assert.assertEquals("1", processor.getValue("fn:format('%s', beanK.next())", String.class));
Assert.assertEquals(1, bean.argCalls);
}

@Test
public void testVarargMethodEmptyVarargs01() throws NoSuchMethodException {
// Java passes an empty array, never null, to a varargs method that is
Expand Down