This is an automated email from the ASF dual-hosted git repository.
remm 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 62a18b1fa3 Fix stack trace trimming
62a18b1fa3 is described below
commit 62a18b1fa3cd35f9cfd1eaa699c0341e4950f029
Author: remm <[email protected]>
AuthorDate: Fri Mar 28 22:12:30 2025 +0100
Fix stack trace trimming
internalDoFilter does not exist anymore following the removal of the
security manager.
---
java/org/apache/catalina/valves/ErrorReportValve.java | 2 +-
java/org/apache/catalina/valves/JsonErrorReportValve.java | 2 +-
webapps/docs/changelog.xml | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java
b/java/org/apache/catalina/valves/ErrorReportValve.java
index 8c8719f287..fcb673cd5a 100644
--- a/java/org/apache/catalina/valves/ErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ErrorReportValve.java
@@ -360,7 +360,7 @@ public class ErrorReportValve extends ValveBase {
int pos = elements.length;
for (int i = elements.length - 1; i >= 0; i--) {
if
((elements[i].getClassName().startsWith("org.apache.catalina.core.ApplicationFilterChain"))
&&
- (elements[i].getMethodName().equals("internalDoFilter"))) {
+ (elements[i].getMethodName().equals("doFilter"))) {
pos = i;
break;
}
diff --git a/java/org/apache/catalina/valves/JsonErrorReportValve.java
b/java/org/apache/catalina/valves/JsonErrorReportValve.java
index beb0b5866c..15f526b8a4 100644
--- a/java/org/apache/catalina/valves/JsonErrorReportValve.java
+++ b/java/org/apache/catalina/valves/JsonErrorReportValve.java
@@ -104,7 +104,7 @@ public class JsonErrorReportValve extends ErrorReportValve {
int pos = elements.length;
for (int i = elements.length - 1; i >= 0; i--) {
if
((elements[i].getClassName().startsWith("org.apache.catalina.core.ApplicationFilterChain"))
&&
-
(elements[i].getMethodName().equals("internalDoFilter"))) {
+ (elements[i].getMethodName().equals("doFilter"))) {
pos = i;
break;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4e06809b75..71f58683bf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -211,6 +211,10 @@
<code>JsonErrorReportValve</code> equivalent to the one from
<code>ErrorReportValve</code>. (remm)
</fix>
+ <fix>
+ Fix stack trace trimming in <code>ErrorReportValve</code> after removal
+ of the security manager support. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
