This is an automated email from the ASF dual-hosted git repository.
rmaucher 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 186759d26e Change exception propagation so that the test works
186759d26e is described below
commit 186759d26e84ac002ea9c4dd3e8d9886027c8de8
Author: remm <[email protected]>
AuthorDate: Tue Jun 30 16:08:43 2026 +0200
Change exception propagation so that the test works
---
.../apache/jasper/security/SecurityClassLoad.java | 44 +++++++++++-----------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/java/org/apache/jasper/security/SecurityClassLoad.java
b/java/org/apache/jasper/security/SecurityClassLoad.java
index 9fb3438124..6224629947 100644
--- a/java/org/apache/jasper/security/SecurityClassLoad.java
+++ b/java/org/apache/jasper/security/SecurityClassLoad.java
@@ -26,8 +26,13 @@ import org.apache.juli.logging.LogFactory;
*/
public final class SecurityClassLoad {
- public static void securityClassLoad(ClassLoader loader) throws Exception {
- securityClassLoad(loader, true);
+ public static void securityClassLoad(ClassLoader loader) {
+ try {
+ securityClassLoad(loader, true);
+ } catch (Exception ex) {
+ Log log = LogFactory.getLog(SecurityClassLoad.class);
+ log.error(Localizer.getMessage("jsp.error.securityPreload"), ex);
+ }
}
@@ -38,31 +43,26 @@ public final class SecurityClassLoad {
}
final String basePackage = "org.apache.jasper.";
- try {
- // Ensure XMLInputFactory is loaded with Tomcat's class loader
- loader.loadClass(basePackage + "compiler.EncodingDetector");
+ // Ensure XMLInputFactory is loaded with Tomcat's class loader
+ loader.loadClass(basePackage + "compiler.EncodingDetector");
- loader.loadClass(basePackage + "runtime.JspContextWrapper");
- loader.loadClass(basePackage +
"runtime.JspFactoryImpl$PrivilegedGetPageContext");
- loader.loadClass(basePackage +
"runtime.JspFactoryImpl$PrivilegedReleasePageContext");
- loader.loadClass(basePackage + "runtime.JspFragmentHelper");
+ loader.loadClass(basePackage + "runtime.JspContextWrapper");
+ loader.loadClass(basePackage +
"runtime.JspFactoryImpl$PrivilegedGetPageContext");
+ loader.loadClass(basePackage +
"runtime.JspFactoryImpl$PrivilegedReleasePageContext");
+ loader.loadClass(basePackage + "runtime.JspFragmentHelper");
- Class<?> clazz = loader.loadClass(basePackage +
"runtime.JspRuntimeLibrary");
- clazz.getConstructor().newInstance();
+ Class<?> clazz = loader.loadClass(basePackage +
"runtime.JspRuntimeLibrary");
+ clazz.getConstructor().newInstance();
- loader.loadClass(basePackage + "runtime.PageContextImpl");
+ loader.loadClass(basePackage + "runtime.PageContextImpl");
- loader.loadClass(basePackage + "runtime.ProtectedFunctionMapper");
- loader.loadClass(basePackage +
"runtime.ServletResponseWrapperInclude");
- loader.loadClass(basePackage + "runtime.TagHandlerPool");
+ loader.loadClass(basePackage + "runtime.ProtectedFunctionMapper");
+ loader.loadClass(basePackage +
"runtime.ServletResponseWrapperInclude");
+ loader.loadClass(basePackage + "runtime.TagHandlerPool");
- // Trigger loading of class and reading of property
- SecurityUtil.isPackageProtectionEnabled();
+ // Trigger loading of class and reading of property
+ SecurityUtil.isPackageProtectionEnabled();
- loader.loadClass(basePackage + "servlet.JspServletWrapper");
- } catch (Exception ex) {
- Log log = LogFactory.getLog(SecurityClassLoad.class);
- log.error(Localizer.getMessage("jsp.error.securityPreload"), ex);
- }
+ loader.loadClass(basePackage + "servlet.JspServletWrapper");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
