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 2014/08/04 19:50:05 UTC
svn commit: r1615710 - in /tomcat/trunk:
java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
webapps/docs/changelog.xml
Author: markt
Date: Mon Aug 4 17:50:04 2014
New Revision: 1615710
URL: http://svn.apache.org/r1615710
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56796
Remove unnecessary sleep when stopping a web application.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java?rev=1615710&r1=1615709&r2=1615710&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java Mon Aug 4 17:50:04 2014
@@ -197,18 +197,9 @@ public class ThreadPoolExecutor extends
// setCorePoolSize(0) wakes idle threads
this.setCorePoolSize(0);
- // wait a little so that idle threads wake and poll the queue again,
- // this time always with a timeout (queue.poll() instead of
- // queue.take())
- // even if we did not wait enough, TaskQueue.take() takes care of timing
- // out, so that we are sure that all threads of the pool are renewed in
- // a limited time, something like
+ // TaskQueue.take() takes care of timing out, so that we are sure that
+ // all threads of the pool are renewed in a limited time, something like
// (threadKeepAlive + longest request time)
- try {
- Thread.sleep(200L);
- } catch (InterruptedException e) {
- // yes, ignore
- }
if (taskQueue != null) {
// ok, restore the state of the queue and pool
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1615710&r1=1615709&r2=1615710&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Aug 4 17:50:04 2014
@@ -86,6 +86,10 @@
header is returned for resources that might be returned directly in
compressed form.
</fix>
+ <fix>
+ <bug>56796</bug>: Remove unnecessary sleep when stopping a web
+ application. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org