Author: markt
Date: Fri Mar 10 16:17:57 2017
New Revision: 1786377
URL: http://svn.apache.org/viewvc?rev=1786377&view=rev
Log:
Correct a potential exception during shutdown when one or more Containers are
configured with a value of 1 for startStopThreads.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/threads/InlineExecutorService.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/tomcat/util/threads/InlineExecutorService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/threads/InlineExecutorService.java?rev=1786377&r1=1786376&r2=1786377&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/threads/InlineExecutorService.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/threads/InlineExecutorService.java
Fri Mar 10 16:17:57 2017
@@ -59,7 +59,7 @@ public class InlineExecutorService exten
if (terminated) {
return true;
}
- this.wait(unit.toMillis(timeout));
+ lock.wait(unit.toMillis(timeout));
return terminated;
}
}
@@ -77,7 +77,7 @@ public class InlineExecutorService exten
taskRunning = false;
if (shutdown) {
terminated = true;
- this.notifyAll();
+ lock.notifyAll();
}
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1786377&r1=1786376&r2=1786377&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Mar 10 16:17:57 2017
@@ -59,6 +59,11 @@
programmatic interface no longer trigger a
<code>NullPointerException</code>. (markt)
</fix>
+ <fix>
+ Correct a potential exception during shutdown when one or more
+ Containers are configured with a value of 1 for startStopThreads.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
