This is an automated email from the ASF dual-hosted git repository.
markt-asf 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 3fb411e6fd Review "Keep the wrapped exception in the JSP EL exception
cause chain"
3fb411e6fd is described below
commit 3fb411e6fd6ea17dec5a24f13f96856ba7f8e2a6
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 b035649e21..6fafaa70fa 100644
--- a/java/org/apache/jasper/el/JspELException.java
+++ b/java/org/apache/jasper/el/JspELException.java
@@ -35,6 +35,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 a70fa90144..7f3e875ed6 100644
--- a/java/org/apache/jasper/el/JspMethodNotFoundException.java
+++ b/java/org/apache/jasper/el/JspMethodNotFoundException.java
@@ -35,6 +35,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 442674946e..32d74352ec 100644
--- a/java/org/apache/jasper/el/JspPropertyNotFoundException.java
+++ b/java/org/apache/jasper/el/JspPropertyNotFoundException.java
@@ -35,7 +35,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 f0bee31c93..2d47d42e9d 100644
--- a/java/org/apache/jasper/el/JspPropertyNotWritableException.java
+++ b/java/org/apache/jasper/el/JspPropertyNotWritableException.java
@@ -35,6 +35,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]
