Author: markt
Date: Thu Nov 27 13:40:05 2008
New Revision: 721286
URL: http://svn.apache.org/viewvc?rev=721286&view=rev
Log:
Add doPrivileged block required for Servlet TCK to pass when running with a
security manager
Modified:
tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java?rev=721286&r1=721285&r2=721286&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java Thu Nov 27
13:40:05 2008
@@ -196,7 +196,17 @@
}
- public JspApplicationContext getJspApplicationContext(ServletContext
context) {
- return JspApplicationContextImpl.getInstance(context);
+ public JspApplicationContext getJspApplicationContext(
+ final ServletContext context) {
+ if (Constants.IS_SECURITY_ENABLED) {
+ return AccessController.doPrivileged(
+ new PrivilegedAction<JspApplicationContext>() {
+ public JspApplicationContext run() {
+ return JspApplicationContextImpl.getInstance(context);
+ }
+ });
+ } else {
+ return JspApplicationContextImpl.getInstance(context);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
