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 2011/10/21 16:56:11 UTC
svn commit: r1187381 -
/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: markt
Date: Fri Oct 21 14:56:10 2011
New Revision: 1187381
URL: http://svn.apache.org/viewvc?rev=1187381&view=rev
Log:
Re-order so context class loader is always reset for keep-alive timer
thread even if the thread has stopped.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1187381&r1=1187380&r2=1187381&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Fri Oct 21 14:56:10 2011
@@ -2196,11 +2196,6 @@ public class WebappClassLoader
continue;
}
- // Skip threads that have already died
- if (!thread.isAlive()) {
- continue;
- }
-
// JVM controlled threads
ThreadGroup tg = thread.getThreadGroup();
if (tg != null &&
@@ -2218,6 +2213,11 @@ public class WebappClassLoader
continue;
}
+ // Skip threads that have already died
+ if (!thread.isAlive()) {
+ continue;
+ }
+
// TimerThread can be stopped safely so treat separately
if (thread.getClass().getName().equals(
"java.util.TimerThread") &&
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org