From e5655fc2cd8ed6f19e7a9baafe3000e7b196c141 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 26 Jul 2013 14:10:03 -0700 Subject: [PATCH] JSR-356 tweaking use of configureContext --- .../jsr356/server/WebSocketConfiguration.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/WebSocketConfiguration.java b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/WebSocketConfiguration.java index 0203ec5d3c2..71113487138 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/WebSocketConfiguration.java +++ b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/WebSocketConfiguration.java @@ -39,7 +39,7 @@ public class WebSocketConfiguration extends AbstractConfiguration { private static final Logger LOG = Log.getLogger(WebSocketConfiguration.class); - public void configureContext(ServletContextHandler context, boolean startContainer) + public static ServerContainer configureContext(ServletContextHandler context) { WebSocketUpgradeFilter filter = new WebSocketUpgradeFilter(); FilterHolder fholder = new FilterHolder(filter); @@ -58,17 +58,14 @@ public class WebSocketConfiguration extends AbstractConfiguration // Store a reference to the ServerContainer per javax.websocket spec 1.0 final section 6.4 Programmatic Server Deployment context.setAttribute(javax.websocket.server.ServerContainer.class.getName(),jettyContainer); - - if (startContainer) - { - jettyContainer.start(); - } + + return jettyContainer; } @Override public void configure(WebAppContext context) throws Exception { - configureContext(context,false); + WebSocketConfiguration.configureContext(context); } @Override