Author: markt Date: Tue Dec 17 08:22:16 2013 New Revision: 1551481 URL: http://svn.apache.org/r1551481 Log: Avoid NPE on shutdown if application doesn't use WebSocket
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1551481&r1=1551480&r2=1551481&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java Tue Dec 17 08:22:16 2013 @@ -451,6 +451,9 @@ public class WsServerContainer extends W void shutdownExecutor() { + if (executorService == null) { + return; + } executorService.shutdown(); try { executorService.awaitTermination(10, TimeUnit.SECONDS); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org