Author: markt
Date: Fri Nov 16 19:38:51 2012
New Revision: 1410548
URL: http://svn.apache.org/viewvc?rev=1410548&view=rev
Log:
Fix TCK failures under a security manager.
Fix additional security exceptions identified during testing
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1410545
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1410548&r1=1410547&r2=1410548&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Fri Nov 16 19:38:51 2012
@@ -43,6 +43,7 @@ public final class SecurityClassLoad {
loadRealmPackage(loader);
loadSessionPackage(loader);
loadUtilPackage(loader);
+ loadValvesPackage(loader);
loadJavaxPackage(loader);
loadConnectorPackage(loader);
loadTomcatPackage(loader);
@@ -54,6 +55,9 @@ public final class SecurityClassLoad {
final String basePackage = "org.apache.catalina.core.";
loader.loadClass
(basePackage +
+ "AccessLogAdapter");
+ loader.loadClass
+ (basePackage +
"ApplicationContextFacade$1");
loader.loadClass
(basePackage +
@@ -72,6 +76,12 @@ public final class SecurityClassLoad {
"AsyncContextImpl$1");
loader.loadClass
(basePackage +
+ "AsyncContextImpl$PrivilegedGetTccl");
+ loader.loadClass
+ (basePackage +
+ "AsyncContextImpl$PrivilegedSetTccl");
+ loader.loadClass
+ (basePackage +
"AsyncListenerWrapper");
loader.loadClass
(basePackage +
@@ -136,6 +146,13 @@ public final class SecurityClassLoad {
}
+ private static final void loadValvesPackage(ClassLoader loader)
+ throws Exception {
+ final String basePackage = "org.apache.catalina.valves.";
+ loader.loadClass(basePackage + "AccessLogValve$3");
+ }
+
+
private static final void loadCoyotePackage(ClassLoader loader)
throws Exception {
final String basePackage = "org.apache.coyote.";
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1410548&r1=1410547&r2=1410548&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Nov 16 19:38:51 2012
@@ -157,6 +157,11 @@
Revert occasional API change in <code>BaseDirContext</code> class that
was done in 7.0.32. Methods should not be <code>final</code>.
(kkolinko)
</fix>
+ <fix>
+ Prevent failures in the AccessLogValve when running under a
+ SecurityManager and the first request received is an asynchronous one.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
