This is an automated email from the ASF dual-hosted git repository.
markt 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 66d6ba3148 Corrections to BZ 68119 fix
66d6ba3148 is described below
commit 66d6ba3148f20c94c8aebf31badb1343d7648995
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Nov 27 15:46:32 2023 +0000
Corrections to BZ 68119 fix
Use correct resolver array for type conversion
Use correct name for Graal resolver
---
java/jakarta/el/CompositeELResolver.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/jakarta/el/CompositeELResolver.java
b/java/jakarta/el/CompositeELResolver.java
index 6844400f9f..6c8ced4f8e 100644
--- a/java/jakarta/el/CompositeELResolver.java
+++ b/java/jakarta/el/CompositeELResolver.java
@@ -50,7 +50,7 @@ public class CompositeELResolver extends ELResolver {
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add("jakarta.servlet.jsp.el.NotFoundELResolver");
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add("jakarta.servlet.jsp.el.ScopedAttributeELResolver");
// Tomcat internal resolvers - referenced by name to avoid creating
dependency
-
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add("org.apache.jasper.el.JasperELResolver");
+
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add("org.apache.jasper.el.JasperELResolver$GraalBeanELResolver");
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add("org.apache.el.stream.StreamELResolverImpl");
}
@@ -199,7 +199,7 @@ public class CompositeELResolver extends ELResolver {
context.setPropertyResolved(false);
int sz = typeConvertersSize;
for (int i = 0; i < sz; i++) {
- T result = this.resolvers[i].convertToType(context, obj, type);
+ T result = this.typeConverters[i].convertToType(context, obj,
type);
if (context.isPropertyResolved()) {
return result;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
