Author: markt Date: Tue Dec 17 08:37:11 2013 New Revision: 1551485 URL: http://svn.apache.org/r1551485 Log: Avoid expected warning
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1551482 Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1551485&r1=1551484&r2=1551485&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Tue Dec 17 08:37:11 2013 @@ -522,14 +522,16 @@ public abstract class AbstractEndpoint { //this is our internal one, so we need to shut it down ThreadPoolExecutor tpe = (ThreadPoolExecutor) executor; tpe.shutdownNow(); - try { - tpe.awaitTermination(getExecutorTerminationTimeoutMillis(), - TimeUnit.MILLISECONDS); - } catch (InterruptedException e) { - // Ignore - } - if (tpe.isTerminating()) { - getLog().warn(sm.getString("endpoint.warn.executorShutdown", getName())); + long timeout = getExecutorTerminationTimeoutMillis(); + if (timeout > 0) { + try { + tpe.awaitTermination(timeout, TimeUnit.MILLISECONDS); + } catch (InterruptedException e) { + // Ignore + } + if (tpe.isTerminating()) { + getLog().warn(sm.getString("endpoint.warn.executorShutdown", getName())); + } } TaskQueue queue = (TaskQueue) tpe.getQueue(); queue.setParent(null); 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=1551485&r1=1551484&r2=1551485&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Dec 17 08:37:11 2013 @@ -83,6 +83,17 @@ </fix> </changelog> </subsection> + <subsection name="Coyote"> + <changelog> + <fix> + When using the BIO connector with an internal executor, do not display a + warning that the executor has not shutdown as the default configuration + for BIO connectors is not to wait. This is because threads in + keep-alive connections cannot be interrupted and therefore the warning + was nearly always displayed. (markt) + </fix> + </changelog> + </subsection> <subsection name="Cluster"> <changelog> <fix> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org