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

rmaucher pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 7b1cd4a1c6968c60153159f7415fb1fc1c143540
Author: remm <[email protected]>
AuthorDate: Sun Oct 18 18:13:57 2026 +0200

    Compatibility
---
 java/org/apache/el/MethodExpressionImpl.java    | 2 --
 java/org/apache/el/MethodExpressionLiteral.java | 2 --
 java/org/apache/el/ValueExpressionImpl.java     | 2 --
 test/org/apache/el/TestValueExpressionImpl.java | 6 +++---
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/el/MethodExpressionImpl.java 
b/java/org/apache/el/MethodExpressionImpl.java
index 3571e162c8..1966b5f379 100644
--- a/java/org/apache/el/MethodExpressionImpl.java
+++ b/java/org/apache/el/MethodExpressionImpl.java
@@ -20,7 +20,6 @@ import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serial;
 
 import javax.el.ELContext;
 import javax.el.ELException;
@@ -67,7 +66,6 @@ import org.apache.el.util.ReflectionUtil;
  */
 public final class MethodExpressionImpl extends MethodExpression implements 
Externalizable {
 
-    @Serial
     private static final long serialVersionUID = 1L;
 
     private Class<?> expectedType;
diff --git a/java/org/apache/el/MethodExpressionLiteral.java 
b/java/org/apache/el/MethodExpressionLiteral.java
index 540ac1ee97..4880b1d4fa 100644
--- a/java/org/apache/el/MethodExpressionLiteral.java
+++ b/java/org/apache/el/MethodExpressionLiteral.java
@@ -20,7 +20,6 @@ import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serial;
 
 import javax.el.ELContext;
 import javax.el.ELException;
@@ -35,7 +34,6 @@ import org.apache.el.util.ReflectionUtil;
  */
 public class MethodExpressionLiteral extends MethodExpression implements 
Externalizable {
 
-    @Serial
     private static final long serialVersionUID = 1L;
 
     private Class<?> expectedType;
diff --git a/java/org/apache/el/ValueExpressionImpl.java 
b/java/org/apache/el/ValueExpressionImpl.java
index 708681370a..97fabee75c 100644
--- a/java/org/apache/el/ValueExpressionImpl.java
+++ b/java/org/apache/el/ValueExpressionImpl.java
@@ -20,7 +20,6 @@ import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serial;
 
 import javax.el.ELContext;
 import javax.el.ELException;
@@ -75,7 +74,6 @@ import org.apache.el.util.ReflectionUtil;
  */
 public final class ValueExpressionImpl extends ValueExpression implements 
Externalizable {
 
-    @Serial
     private static final long serialVersionUID = 1L;
 
     private Class<?> expectedType;
diff --git a/test/org/apache/el/TestValueExpressionImpl.java 
b/test/org/apache/el/TestValueExpressionImpl.java
index 9f73939fef..1be1a2dad7 100644
--- a/test/org/apache/el/TestValueExpressionImpl.java
+++ b/test/org/apache/el/TestValueExpressionImpl.java
@@ -87,7 +87,7 @@ public class TestValueExpressionImpl {
     @Test
     public void testGetValueReferenceMethodCall() {
         ExpressionFactory factory = ExpressionFactory.newInstance();
-        ELContext context = new ELContextImpl();
+        ELContext context = new ELContextImpl(factory);
 
         TesterBeanM beanM = new TesterBeanM();
         ValueExpression var = factory.createValueExpression(beanM, 
TesterBeanM.class);
@@ -103,7 +103,7 @@ public class TestValueExpressionImpl {
     @Test
     public void testGetValueReferenceMethodCallResult() {
         ExpressionFactory factory = ExpressionFactory.newInstance();
-        ELContext context = new ELContextImpl();
+        ELContext context = new ELContextImpl(factory);
 
         TesterBeanM beanM = new TesterBeanM();
         ValueExpression var = factory.createValueExpression(beanM, 
TesterBeanM.class);
@@ -123,7 +123,7 @@ public class TestValueExpressionImpl {
     @Test
     public void testGetValueReferencePropertyThenMethodCall() {
         ExpressionFactory factory = ExpressionFactory.newInstance();
-        ELContext context = new ELContextImpl();
+        ELContext context = new ELContextImpl(factory);
 
         TesterBeanM beanM = new TesterBeanM();
         ValueExpression var = factory.createValueExpression(beanM, 
TesterBeanM.class);


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to