Author: markt Date: Tue Dec 17 08:28:25 2013 New Revision: 1551483 URL: http://svn.apache.org/r1551483 Log: Avoid NPE on shutdown if application isn't using WebSocket.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1551481 Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1551483&r1=1551482&r2=1551483&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java Tue Dec 17 08:28:25 2013 @@ -454,6 +454,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