This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new b14484403c Review "Keep the wrapped exception in the JSP EL exception
cause chain"
b14484403c is described below
commit b14484403c8ac8b8f3959fb588a3a119b169d4f8
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Nov 6 08:43:21 2026 +0000
Review "Keep the wrapped exception in the JSP EL exception cause chain"
Fix the regression in error-page handling while preserving exceptions
that have no cause (the target of the original fix)
---
java/org/apache/jasper/el/JspELException.java | 2 +-
java/org/apache/jasper/el/JspMethodNotFoundException.java | 2 +-
java/org/apache/jasper/el/JspPropertyNotFoundException.java | 2 +-
java/org/apache/jasper/el/JspPropertyNotWritableException.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/jasper/el/JspELException.java
b/java/org/apache/jasper/el/JspELException.java
index e8e80cfe40..d252f4b7c6 100644
--- a/java/org/apache/jasper/el/JspELException.java
+++ b/java/org/apache/jasper/el/JspELException.java
@@ -32,6 +32,6 @@ public class JspELException extends ELException {
* @param e the underlying ELException
*/
public JspELException(String mark, ELException e) {
- super(mark + " " + e.getMessage(), e);
+ super(mark + " " + e.getMessage(), e.getCause() == null ? e :
e.getCause());
}
}
diff --git a/java/org/apache/jasper/el/JspMethodNotFoundException.java
b/java/org/apache/jasper/el/JspMethodNotFoundException.java
index 7899b0ad23..ae32f7cbf0 100644
--- a/java/org/apache/jasper/el/JspMethodNotFoundException.java
+++ b/java/org/apache/jasper/el/JspMethodNotFoundException.java
@@ -32,6 +32,6 @@ public class JspMethodNotFoundException extends
MethodNotFoundException {
* @param e the underlying MethodNotFoundException
*/
public JspMethodNotFoundException(String mark, MethodNotFoundException e) {
- super(mark + " " + e.getMessage(), e);
+ super(mark + " " + e.getMessage(), e.getCause() == null ? e :
e.getCause());
}
}
diff --git a/java/org/apache/jasper/el/JspPropertyNotFoundException.java
b/java/org/apache/jasper/el/JspPropertyNotFoundException.java
index 80f7f04a49..bdb9e6e505 100644
--- a/java/org/apache/jasper/el/JspPropertyNotFoundException.java
+++ b/java/org/apache/jasper/el/JspPropertyNotFoundException.java
@@ -32,7 +32,7 @@ public final class JspPropertyNotFoundException extends
PropertyNotFoundExceptio
* @param e The cause exception
*/
public JspPropertyNotFoundException(String mark, PropertyNotFoundException
e) {
- super(mark + " " + e.getMessage(), e);
+ super(mark + " " + e.getMessage(), e.getCause() == null ? e :
e.getCause());
}
}
diff --git a/java/org/apache/jasper/el/JspPropertyNotWritableException.java
b/java/org/apache/jasper/el/JspPropertyNotWritableException.java
index 9c99f7b91b..a20732497e 100644
--- a/java/org/apache/jasper/el/JspPropertyNotWritableException.java
+++ b/java/org/apache/jasper/el/JspPropertyNotWritableException.java
@@ -32,6 +32,6 @@ public class JspPropertyNotWritableException extends
PropertyNotWritableExceptio
* @param e The cause exception
*/
public JspPropertyNotWritableException(String mark,
PropertyNotWritableException e) {
- super(mark + " " + e.getMessage(), e);
+ super(mark + " " + e.getMessage(), e.getCause() == null ? e :
e.getCause());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
