Author: markt
Date: Wed Jan 2 20:41:24 2013
New Revision: 1428018
URL: http://svn.apache.org/viewvc?rev=1428018&view=rev
Log:
Prevent ClassNotFoundExceptions on stop when running as a service
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1427846,1428010
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=1428018&r1=1428017&r2=1428018&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java Wed
Jan 2 20:41:24 2013
@@ -430,6 +430,11 @@ public final class Bootstrap {
return;
}
daemon = bootstrap;
+ } else {
+ // When running as a service the call to stop will be on a new
+ // thread so make sure the correct class loader is used to prevent
+ // a range of class not found exceptions.
+
Thread.currentThread().setContextClassLoader(daemon.catalinaLoader);
}
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=1428018&r1=1428017&r2=1428018&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 2 20:41:24 2013
@@ -54,6 +54,14 @@
issues to not "pop up" wrt. others).
-->
<section name="Tomcat 7.0.35 (markt)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>54247</bug>: Prevent <code>ClassNotFoundException</code>s on stop
+ when running as a service. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Jasper">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
