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 8a5e5475f1 Restore final keywords
8a5e5475f1 is described below

commit 8a5e5475f1ead35589dc8c5e359b9395838112b7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 31 17:27:02 2025 +0100

    Restore final keywords
    
    Removing final broke the signature tests for the pages TCK. final does
    have a meaning for static methods - it prevents sub-classes re-defining
    them.
---
 java/jakarta/servlet/jsp/tagext/SimpleTagSupport.java | 2 +-
 java/jakarta/servlet/jsp/tagext/TagSupport.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/jakarta/servlet/jsp/tagext/SimpleTagSupport.java 
b/java/jakarta/servlet/jsp/tagext/SimpleTagSupport.java
index 84a05c08a9..3398b2d4f8 100644
--- a/java/jakarta/servlet/jsp/tagext/SimpleTagSupport.java
+++ b/java/jakarta/servlet/jsp/tagext/SimpleTagSupport.java
@@ -157,7 +157,7 @@ public class SimpleTagSupport implements SimpleTag {
      *
      * @return the nearest ancestor that implements the interface or is an 
instance of the class specified
      */
-    public static JspTag findAncestorWithClass(JspTag from, Class<?> klass) {
+    public static final JspTag findAncestorWithClass(JspTag from, Class<?> 
klass) {
         boolean isInterface = false;
 
         if (from == null || klass == null ||
diff --git a/java/jakarta/servlet/jsp/tagext/TagSupport.java 
b/java/jakarta/servlet/jsp/tagext/TagSupport.java
index 48d554759b..311029dc66 100644
--- a/java/jakarta/servlet/jsp/tagext/TagSupport.java
+++ b/java/jakarta/servlet/jsp/tagext/TagSupport.java
@@ -61,7 +61,7 @@ public class TagSupport implements IterationTag, Serializable 
{
      *
      * @return the nearest ancestor that implements the interface or is an 
instance of the class specified
      */
-    public static Tag findAncestorWithClass(Tag from, Class<?> klass) {
+    public static final Tag findAncestorWithClass(Tag from, Class<?> klass) {
         boolean isInterface = false;
 
         if (from == null || klass == null ||


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to