This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1a850615aefd14061a2cc9d96f5e597fb173b798
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 29 17:17:03 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
.../apache/jasper/security/SecurityClassLoad.java | 29 ++++++++++++----------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/java/org/apache/jasper/security/SecurityClassLoad.java
b/java/org/apache/jasper/security/SecurityClassLoad.java
index 77a0d59..3642847 100644
--- a/java/org/apache/jasper/security/SecurityClassLoad.java
+++ b/java/org/apache/jasper/security/SecurityClassLoad.java
@@ -27,32 +27,35 @@ import org.apache.juli.logging.LogFactory;
*/
public final class SecurityClassLoad {
- public static void securityClassLoad(ClassLoader loader){
+ public static void securityClassLoad(ClassLoader loader) {
- if( System.getSecurityManager() == null ){
+ if (System.getSecurityManager() == null) {
return;
}
final String basePackage = "org.apache.jasper.";
try {
// Ensure XMLInputFactory is loaded with Tomcat's class loader
- loader.loadClass( basePackage + "compiler.EncodingDetector");
+ 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");
- Class<?> clazz = loader.loadClass( basePackage +
"runtime.JspRuntimeLibrary");
+ 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();
- loader.loadClass( basePackage + "runtime.PageContextImpl");
- loader.loadClass( basePackage + "runtime.ProtectedFunctionMapper");
- loader.loadClass( basePackage +
"runtime.ServletResponseWrapperInclude");
- loader.loadClass( basePackage + "runtime.TagHandlerPool");
+
+ loader.loadClass(basePackage + "runtime.PageContextImpl");
+
+ 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();
- loader.loadClass( basePackage + "servlet.JspServletWrapper");
+ loader.loadClass(basePackage + "servlet.JspServletWrapper");
} catch (Exception ex) {
Log log = LogFactory.getLog(SecurityClassLoad.class);
log.error(Localizer.getMessage("jsp.error.securityPreload"), ex);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
