Mercurial > hg > thermostat-ng > web-gateway

changeset 301:f72a7db944c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not initialize websocket services twice. Reviewed-by: neugens Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-October/025556.html PR3395
author Severin Gehwolf <sgehwolf@redhat.com>
date Thu, 26 Oct 2017 17:54:03 +0200
parents 428e596f867d
children 5e79312c8075
files server/src/main/java/com/redhat/thermostat/gateway/server/CoreServerBuilder.java
diffstat 1 files changed, 0 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/server/src/main/java/com/redhat/thermostat/gateway/server/CoreServerBuilder.java	Fri Oct 27 14:39:15 2017 -0400
+++ b/server/src/main/java/com/redhat/thermostat/gateway/server/CoreServerBuilder.java	Thu Oct 26 17:54:03 2017 +0200
@@ -41,8 +41,6 @@
 import java.nio.file.Paths;
 import java.util.Map;
 
-import javax.servlet.ServletException;
-
 import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.HttpConfiguration;
@@ -55,7 +53,6 @@
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer;
 
 import com.redhat.thermostat.gateway.common.core.config.Configuration;
 import com.redhat.thermostat.gateway.common.core.config.GatewayHomeRetriever;
@@ -118,13 +115,6 @@
         for (CoreService service: coreServiceBuilder.build()) {
             ServletContextHandler handler = service.createServletContextHandler(server);
             contextHandlerCollection.addHandler(handler);
-            // Initialize javax.websocket layer
-            try {
-                handler.setServer(server);
-                WebSocketServerContainerInitializer.configureContext(handler);
-            } catch (ServletException e) {
-                throw new RuntimeException(e);
-            }
         }
 
         Map<String, Object> config = serverConfig.asMap();