Author: markt Date: Fri Oct 28 12:46:59 2011 New Revision: 1190279 URL: http://svn.apache.org/viewvc?rev=1190279&view=rev Log: Fix potential NPE
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1190279&r1=1190278&r2=1190279&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Fri Oct 28 12:46:59 2011 @@ -1190,7 +1190,10 @@ public abstract class ContainerBase exte parent.removeChild(this); } - startStopExecutor.shutdownNow(); + // If init fails, this may be null + if (startStopExecutor != null) { + startStopExecutor.shutdownNow(); + } super.destroyInternal(); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org