projects / tomcat7.0 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4c7b88a)
Fix running with a security manager
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Mon, 2 Aug 2010 10:49:06 +0000 (10:49 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Mon, 2 Aug 2010 10:49:06 +0000 (10:49 +0000)
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@981448 13f79535-47bb-0310-9956-ffa450edef68

java/org/apache/catalina/security/SecurityClassLoad.java patch | blob | history
webapps/docs/changelog.xml patch | blob | history

diff --git a/java/org/apache/catalina/security/SecurityClassLoad.java b/java/org/apache/catalina/security/SecurityClassLoad.java
index bb67595..385bae2 100644 (file)
--- a/java/org/apache/catalina/security/SecurityClassLoad.java
+++ b/java/org/apache/catalina/security/SecurityClassLoad.java
@@ -73,9 +73,6 @@ public final class SecurityClassLoad {
             "AsyncContextImpl$1");
         loader.loadClass
             (basePackage +
-            "AsyncContextImpl$2");
-        loader.loadClass
-            (basePackage +
             "AsyncListenerWrapper");
         loader.loadClass
             (basePackage +
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4906800..97f5488 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -35,7 +35,17 @@
 
 <body>
 <!--  Catalina, Coyote, Jasper, Cluster, Web applications, Extras, Other -->
-<section name="Tomcat 7.0.1 (markt)">
+<section name="Tomcat 7.0.2 (markt)">
+  <subsection name="Catalina">
+    <changelog>
+      <fix>
+        Fix repgrssion that prevented running with a security manager enabled.
+        (markt)
+      </fix>
+    </changelog>
+  </subsection>
+</section>
+<section name="Tomcat 7.0.1 (markt)" rtext="Not released">
   <subsection name="Catalina">
     <changelog>
       <fix>
Unnamed repository; edit this file to name it for gitweb.