You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by yo...@apache.org on 2005/11/16 19:51:12 UTC
svn commit: r345090 - in /tomcat/container/tc5.5.x:
catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java
webapps/docs/changelog.xml
Author: yoavs
Date: Wed Nov 16 10:51:09 2005
New Revision: 345090
URL: http://svn.apache.org/viewcvs?rev=345090&view=rev
Log:
Bugzilla 36852: http://issues.apache.org/bugzilla/show_bug.cgi?id=36852
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java?rev=345090&r1=345089&r2=345090&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java (original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java Wed Nov 16 10:51:09 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2001,2004 The Apache Software Foundation.
+ * Copyright 1999-2001,2004-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -251,6 +251,12 @@
Object ojb = digester.peek();
if (ojb instanceof Container) {
parentClassLoader = ((Container)ojb).getParentClassLoader();
+ }
+
+ // Bugzilla 36852: http://issues.apache.org/bugzilla/show_bug.cgi?id=36852
+ if((ojb instanceof org.apache.catalina.Context) &&
+ (((org.apache.catalina.Context) ojb).getPrivileged())) {
+ parentClassLoader = ojb.getClass().getClassLoader();
}
// Instantiate a new Loader implementation object
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=345090&r1=345089&r2=345090&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Nov 16 10:51:09 2005
@@ -39,6 +39,10 @@
<update>
Update JAF dependency to 1.0.2, JTA to 1.0.1b and JavaMail to 1.3.3_01. (markt)
</update>
+ <add>
+ Added Eclipse .project, .classpath, and associated files to make building Tomcat from
+ Eclipse significantly easier. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Catalina">
@@ -71,6 +75,10 @@
<fix>
<bug>37319</bug>: Fix catalina.bat reference to CATALINA_BASE for logging.properties. Thanks
to Pierre-Yves Benzaken. (yoavs)
+ </fix>
+ <fix>
+ <bug>36852</bug>: Custom classloaders don't honor Contet privileged attribute. Thanks to
+ Matt Brinkley for the analysis and patch. (yoavs)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org