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 9f8a54bc45 Remove comments related to the ability to inline these
methods.
9f8a54bc45 is described below
commit 9f8a54bc4552a7ee0de51579bc5ed5a35b1dbe41
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Mar 6 16:09:32 2025 +0000
Remove comments related to the ability to inline these methods.
This comment that the functionality had been forgotten dates from Tomcat
4.1.x or earlier. I can find no remains (part from these comments) of
the feature to inline these methods. Therefore, remove the comments.
---
.../org/apache/jasper/runtime/JspRuntimeLibrary.java | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
b/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
index 6da1090d8e..1a69d50fda 100644
--- a/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
+++ b/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
@@ -47,11 +47,6 @@ import org.apache.tomcat.InstanceManager;
* Bunch of util methods that are used by code generated for useBean,
* getProperty and setProperty.
*
- * The __begin, __end stuff is there so that the JSP engine can
- * actually parse this file and inline them if people don't want
- * runtime dependencies on this class. However, I'm not sure if that
- * works so well right now. It got forgotten at some point. -akv
- *
* @author Mandar Raje
* @author Shawn Bayern
*/
@@ -226,7 +221,7 @@ public class JspRuntimeLibrary {
}
}
- // __begin convertMethod
+
public static Object convert(String propertyName, String s, Class<?> t,
Class<?> propertyEditorClass)
throws JasperException
@@ -298,9 +293,8 @@ public class JspRuntimeLibrary {
throw new JasperException(ex);
}
}
- // __end convertMethod
- // __begin introspectMethod
+
public static void introspect(Object bean, ServletRequest request)
throws JasperException
{
@@ -311,9 +305,8 @@ public class JspRuntimeLibrary {
introspecthelper(bean, name, value, request, name, true);
}
}
- // __end introspectMethod
- // __begin introspecthelperMethod
+
public static void introspecthelper(Object bean, String prop,
String value, ServletRequest request,
String param, boolean ignoreMethodNF)
@@ -391,12 +384,11 @@ public class JspRuntimeLibrary {
}
}
}
- // __end introspecthelperMethod
+
//-------------------------------------------------------------------
// functions to convert builtin Java data types to string.
//-------------------------------------------------------------------
- // __begin toStringMethod
public static String toString(Object o) {
return String.valueOf(o);
}
@@ -432,7 +424,6 @@ public class JspRuntimeLibrary {
public static String toString(char c) {
return Character.toString(c);
}
- // __end toStringMethod
/**
@@ -600,7 +591,7 @@ public class JspRuntimeLibrary {
return escStringBuilder.toString();
}
- // __begin lookupReadMethodMethod
+
public static Object handleGetProperty(Object o, String prop)
throws JasperException {
if (o == null) {
@@ -618,7 +609,6 @@ public class JspRuntimeLibrary {
}
return value;
}
- // __end lookupReadMethodMethod
// handles <jsp:setProperty> with EL expression for 'value' attribute
public static void handleSetPropertyExpression(Object bean,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
