Author: markt Date: Mon Sep 14 11:24:05 2015 New Revision: 1702910 URL: http://svn.apache.org/r1702910 Log: Fix regression in r1702886
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1702910&r1=1702909&r2=1702910&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Mon Sep 14 11:24:05 2015 @@ -700,8 +700,8 @@ public abstract class AbstractEndpoint<S public void shutdownExecutor() { Executor executor = this.executor; - this.executor = null; if (executor != null && internalExecutor) { + this.executor = null; if (executor instanceof ThreadPoolExecutor) { //this is our internal one, so we need to shut it down ThreadPoolExecutor tpe = (ThreadPoolExecutor) executor; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org