This is an automated email from the ASF dual-hosted git repository. rmaucher pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0c9270778b61aa48cecc6f1d88b0fb8372ae4618 Author: remm <[email protected]> AuthorDate: Sun Oct 18 18:02:58 2026 +0200 Fix bad merge --- java/org/apache/el/parser/AstConcatenation.java | 5 +++++ test/org/apache/el/parser/TestAstConcatenation.java | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/java/org/apache/el/parser/AstConcatenation.java b/java/org/apache/el/parser/AstConcatenation.java index 9caf78705f..a24ba2f9ab 100644 --- a/java/org/apache/el/parser/AstConcatenation.java +++ b/java/org/apache/el/parser/AstConcatenation.java @@ -17,6 +17,11 @@ /* Generated By:JJTree: Do not edit this line. AstConcatenation.java Version 4.3 */ package org.apache.el.parser; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; + import jakarta.el.ELException; import org.apache.el.lang.ELSupport; diff --git a/test/org/apache/el/parser/TestAstConcatenation.java b/test/org/apache/el/parser/TestAstConcatenation.java index be2921cbcc..993408ef63 100644 --- a/test/org/apache/el/parser/TestAstConcatenation.java +++ b/test/org/apache/el/parser/TestAstConcatenation.java @@ -16,6 +16,10 @@ */ package org.apache.el.parser; +import java.util.List; +import java.util.Map; +import java.util.Set; + import jakarta.el.ELContext; import jakarta.el.ELManager; import jakarta.el.ELProcessor; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
