This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 38a629d751 Fix backport
38a629d751 is described below
commit 38a629d751ccc450e233f58664ff4b6ca22bf972
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Nov 5 13:48:38 2026 +0000
Fix backport
---
java/org/apache/el/LocalStrings.properties | 47 +-----------------------------
1 file changed, 1 insertion(+), 46 deletions(-)
diff --git a/java/org/apache/el/LocalStrings.properties
b/java/org/apache/el/LocalStrings.properties
index 1983c88554..5681814e8f 100644
--- a/java/org/apache/el/LocalStrings.properties
+++ b/java/org/apache/el/LocalStrings.properties
@@ -23,52 +23,6 @@ error.add=Cannot add [{0}] to [{1}]
error.convert=Cannot convert [{0}] of type [{1}] to [{2}]
error.compare=Cannot compare [{0}] to [{1}]
error.compare.null=Unable to compare null with non-null object
-<<<<<<< HEAD
-=======
-error.divide=Cannot divide [{0}] by [{1}]
-error.mod=Cannot compute [{0}] modulo [{1}]
-error.multiply=Cannot multiply [{0}] by [{1}]
-error.subtract=Cannot subtract [{1}] from [{0}]
-error.function=Problems calling function [{0}]
-error.invalidMethodExpression=Not a valid method expression [{0}]
-error.noFunctionMapperTarget=FunctionMapper target cannot be null
-error.noVariableMapperTarget=VariableMapper target cannot be null
-error.nullLocalName=Local name cannot be null
-error.nullMethod=Method cannot be null
-error.unreachable.base=Target Unreachable, identifier [{0}] resolved to null
-error.unreachable.property=Target Unreachable, [{0}] returned null
-error.resolver.unhandled=ELResolver did not handle type: [{0}] with property
of [{1}]
-error.resolver.unhandled.null=ELResolver cannot handle a null base Object with
identifier [{0}]
-error.invoke.wrongParams=The method [{0}] was called with [{1}] parameter(s)
when it expected [{2}]
-error.invoke.tooFewParams=The method [{0}] was called with [{1}] parameter(s)
when it expected at least [{2}]
-
-# ValueExpressionLiteral
-error.value.literal.write=ValueExpression is a literal and not writable: [{0}]
-
-# ExpressionFactoryImpl
-error.null=Expression cannot be null
-error.mixed=Expression cannot contain both ''#{...}'' and ''${...}'' : [{0}]
-error.method=Not a valid MethodExpression : [{0}]
-error.method.nullParms=Parameter types cannot be null
-error.value.expectedType=Expected type cannot be null
-
-# ExpressionBuilder
-error.parseFail=Failed to parse the expression [{0}]
-
-# ValueSetVisitor
-error.syntax.set=Illegal Syntax for Set Operation
-
-# ReflectionUtil
-error.method.notfound=Method not found: {0}.{1}({2})
-error.method.ambiguous=Unable to find unambiguous method: {0}.{1}({2})
-
-# ValidatingVisitor
-error.fnMapper.null=Expression uses functions, but no FunctionMapper was
provided
-error.fnMapper.method=Function [{0}] not found
-error.fnMapper.paramcount=Function [{0}] specifies [{1}] params, but [{2}]
were declared
-
-# ExpressionImpl
->>>>>>> e9db1637c4 (Review "11ef7a700d82aaed0d8a48f172f0056aedb27ed3")
error.context.null=ELContext was null
error.convert=Cannot convert [{0}] of type [{1}] to [{2}]
error.divide=Cannot divide [{0}] by [{1}]
@@ -90,6 +44,7 @@ error.method.notfound=Method not found: {0}.{1}({2})
error.method.nullParms=Parameter types cannot be null
error.mixed=Expression cannot contain both ''#{...}'' and ''${...}'' : [{0}]
error.mod=Cannot compute [{0}] modulo [{1}]
+error.multiply=Cannot multiply [{0}] by [{1}]
error.noFunctionMapperTarget=FunctionMapper target cannot be null
error.noVariableMapperTarget=VariableMapper target cannot be null
error.null=Expression cannot be null
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
