Author: remm
Date: Fri Jul 18 07:55:02 2014
New Revision: 1611552
URL: http://svn.apache.org/r1611552
Log:
Backport r1611551. Fix regression with r1611509: NPE on stop (only threadStop
should set thread to null, or it needs a sync).
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1611552&r1=1611551&r2=1611552&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java Fri
Jul 18 07:55:02 2014
@@ -1531,7 +1531,6 @@ public abstract class ContainerBase exte
t = e;
throw e;
} finally {
- thread = null;
if (!threadDone) {
log.error(unexpectedDeathMessage, t);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
