(tomcat) branch main updated: Corrections to BZ 68119 fix

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 9b6ad6b442 Corrections to BZ 68119 fix
9b6ad6b442 is described below

commit 9b6ad6b442a9588714b498c27bac762eb3d0d5b6
Author: Mark Thomas <ma...@apache.org>
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
    OptionalELResolver does type conversion
---
 java/jakarta/el/CompositeELResolver.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/java/jakarta/el/CompositeELResolver.java 
b/java/jakarta/el/CompositeELResolver.java
index f8050c5809..8c9c1fc335 100644
--- a/java/jakarta/el/CompositeELResolver.java
+++ b/java/jakarta/el/CompositeELResolver.java
@@ -39,7 +39,6 @@ public class CompositeELResolver extends ELResolver {
         
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add(BeanNameELResolver.class.getName());
         
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add(ListELResolver.class.getName());
         KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add(MapELResolver.class.getName());
-        
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add(OptionalELResolver.class.getName());
         
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add(RecordELResolver.class.getName());
         
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add(ResourceBundleELResolver.class.getName());
         
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add(StaticFieldELResolver.class.getName());
@@ -49,7 +48,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");
     }
 
@@ -192,7 +191,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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org