Author: remy.maucherat(a)jboss.com Date: 2014-09-03 04:05:20 -0400 (Wed, 03 Sep 2014) New Revision: 2499 Modified: branches/7.5.x/src/main/java/org/apache/tomcat/websocket/server/WsSci.java Log: JBWEB-298: Should address NPE and problems on multiple inits of websockets. Modified: branches/7.5.x/src/main/java/org/apache/tomcat/websocket/server/WsSci.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/websocket/server/WsSci.java 2014-09-01 14:18:30 UTC (rev 2498) +++ branches/7.5.x/src/main/java/org/apache/tomcat/websocket/server/WsSci.java 2014-09-03 08:05:20 UTC (rev 2499) @@ -57,6 +57,10 @@ } return; } + if (ctx.getAttribute(Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE) != null) { + // Websockets already initialized + return; + } WsServerContainer sc = init(ctx, true);