Author: markt
Date: Sat Apr 1 20:42:05 2017
New Revision: 1789842
URL: http://svn.apache.org/viewvc?rev=1789842&view=rev
Log:
Reformat. No functional changed.
Modified:
tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
Modified: tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java?rev=1789842&r1=1789841&r2=1789842&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java Sat Apr
1 20:42:05 2017
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.jasper.security;
import org.apache.juli.logging.Log;
@@ -26,7 +24,6 @@ import org.apache.juli.logging.LogFactor
* Java SecurityManager so that the defineClassInPackage
* RuntimePermission does not trigger an AccessControlException.
*/
-
public final class SecurityClassLoad {
private static final Log log = LogFactory.getLog(SecurityClassLoad.class);
@@ -40,65 +37,41 @@ 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");
+ loader.loadClass( basePackage + "compiler.EncodingDetector");
+
+ loader.loadClass( basePackage +
"runtime.JspFactoryImpl$PrivilegedGetPageContext");
+ loader.loadClass( basePackage +
"runtime.JspFactoryImpl$PrivilegedReleasePageContext");
+
+ loader.loadClass( basePackage + "runtime.JspRuntimeLibrary");
- loader.loadClass( basePackage +
- "runtime.JspFactoryImpl$PrivilegedGetPageContext");
- loader.loadClass( basePackage +
- "runtime.JspFactoryImpl$PrivilegedReleasePageContext");
-
- loader.loadClass( basePackage +
- "runtime.JspRuntimeLibrary");
-
- loader.loadClass( basePackage +
- "runtime.ServletResponseWrapperInclude");
- loader.loadClass( basePackage +
- "runtime.TagHandlerPool");
- loader.loadClass( basePackage +
- "runtime.JspFragmentHelper");
-
- loader.loadClass( basePackage +
- "runtime.ProtectedFunctionMapper");
-
- loader.loadClass( basePackage +
- "runtime.PageContextImpl");
- loader.loadClass( basePackage +
- "runtime.PageContextImpl$1");
- loader.loadClass( basePackage +
- "runtime.PageContextImpl$2");
- loader.loadClass( basePackage +
- "runtime.PageContextImpl$3");
- loader.loadClass( basePackage +
- "runtime.PageContextImpl$4");
- loader.loadClass( basePackage +
- "runtime.PageContextImpl$5");
- loader.loadClass( basePackage +
- "runtime.PageContextImpl$6");
- loader.loadClass( basePackage +
- "runtime.PageContextImpl$7");
- loader.loadClass( basePackage +
- "runtime.PageContextImpl$8");
- loader.loadClass( basePackage +
- "runtime.PageContextImpl$9");
- loader.loadClass( basePackage +
- "runtime.PageContextImpl$10");
- loader.loadClass( basePackage +
- "runtime.PageContextImpl$11");
- loader.loadClass( basePackage +
- "runtime.PageContextImpl$12");
+ loader.loadClass( basePackage +
"runtime.ServletResponseWrapperInclude");
+ loader.loadClass( basePackage + "runtime.TagHandlerPool");
+ loader.loadClass( basePackage + "runtime.JspFragmentHelper");
+
+ loader.loadClass( basePackage + "runtime.ProtectedFunctionMapper");
+
+ loader.loadClass( basePackage + "runtime.PageContextImpl");
+ loader.loadClass( basePackage + "runtime.PageContextImpl$1");
+ loader.loadClass( basePackage + "runtime.PageContextImpl$2");
+ loader.loadClass( basePackage + "runtime.PageContextImpl$3");
+ loader.loadClass( basePackage + "runtime.PageContextImpl$4");
+ loader.loadClass( basePackage + "runtime.PageContextImpl$5");
+ loader.loadClass( basePackage + "runtime.PageContextImpl$6");
+ loader.loadClass( basePackage + "runtime.PageContextImpl$7");
+ loader.loadClass( basePackage + "runtime.PageContextImpl$8");
+ loader.loadClass( basePackage + "runtime.PageContextImpl$9");
+ loader.loadClass( basePackage + "runtime.PageContextImpl$10");
+ loader.loadClass( basePackage + "runtime.PageContextImpl$11");
+ loader.loadClass( basePackage + "runtime.PageContextImpl$12");
- loader.loadClass( basePackage +
- "runtime.JspContextWrapper");
+ loader.loadClass( basePackage + "runtime.JspContextWrapper");
// Trigger loading of class and reading of property
SecurityUtil.isPackageProtectionEnabled();
- loader.loadClass( basePackage +
- "servlet.JspServletWrapper");
+ loader.loadClass( basePackage + "servlet.JspServletWrapper");
- loader.loadClass( basePackage +
- "runtime.JspWriterImpl$1");
+ loader.loadClass( basePackage + "runtime.JspWriterImpl$1");
} catch (ClassNotFoundException ex) {
log.error("SecurityClassLoad", ex);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
