You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/10/17 17:28:25 UTC
svn commit: r1533119 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/catalina/startup/Catalina.java webapps/docs/changelog.xml
Author: markt
Date: Thu Oct 17 15:28:24 2013
New Revision: 1533119
URL: http://svn.apache.org/r1533119
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55656
Configure the Digester to use the server class loader when parsing server.xml rather than the class loader that loaded StandardServer.
Patch provided by Roberto Benedetti.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1533117
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1533119&r1=1533118&r2=1533119&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java Thu Oct 17 15:28:24 2013
@@ -35,7 +35,6 @@ import org.apache.catalina.Globals;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Server;
-import org.apache.catalina.core.StandardServer;
import org.apache.catalina.security.SecurityConfig;
import org.apache.juli.ClassLoaderLogManager;
import org.apache.tomcat.util.ExceptionUtils;
@@ -310,7 +309,7 @@ public class Catalina {
attrs.add("className");
fakeAttributes.put(Object.class, attrs);
digester.setFakeAttributes(fakeAttributes);
- digester.setClassLoader(StandardServer.class.getClassLoader());
+ digester.setUseContextClassLoader(true);
// Configure the actions we will be using
digester.addObjectCreate("Server",
@@ -430,6 +429,7 @@ public class Catalina {
// Initialize the digester
Digester digester = new Digester();
+ digester.setUseContextClassLoader(true);
// Configure the rules we need for shutting down
digester.addObjectCreate("Server",
@@ -459,7 +459,6 @@ public class Catalina {
if( s == null ) {
// Create and execute our Digester
Digester digester = createStopDigester();
- digester.setClassLoader(Thread.currentThread().getContextClassLoader());
File file = configFile();
FileInputStream fis = null;
try {
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=1533119&r1=1533118&r2=1533119&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 17 15:28:24 2013
@@ -55,6 +55,17 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not "pop up" wrt. others).
-->
+<section name="Tomcat 7.0.48 (violetagg)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>55656</bug>: Configure the Digester to use the server class loader
+ when parsing server.xml rather than the class loader that loaded
+ StandardServer. Patch provided by Roberto Benedetti. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
<section name="Tomcat 7.0.47 (violetagg)">
<subsection name="Coyote">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org