Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #1216 to prevent duplicate SCI initialization of WSUF

This commit is contained in:
Joakim Erdfelt 2017-01-04 11:30:19 -04:00
parent 9324971d20
commit 0fc897233a
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/deploy/WebSocketServerContainerInitializer.java
View File

@ -145,7 +145,12 @@ public class WebSocketServerContainerInitializer implements ServletContainerInit
// Create Filter
if(isEnabledViaContext(context.getServletContext(), ADD_DYNAMIC_FILTER_KEY, true))
{
WebSocketUpgradeFilter.configureContext(context);
String instanceKey = WebSocketUpgradeFilter.class.getName() + ".SCI";
if(context.getAttribute(instanceKey) == null)
{
WebSocketUpgradeFilter wsuf = WebSocketUpgradeFilter.configureContext(context);
context.setAttribute(instanceKey, wsuf);
}
}
return jettyContainer;

7
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilter.java
View File

@ -110,7 +110,6 @@ public class WebSocketUpgradeFilter implements Filter, MappedWebSocketCreator, D
}
private NativeWebSocketConfiguration configuration;
private ServletContext context;
private String instanceKey;
private boolean localConfiguration = false;
private boolean alreadySetToAttribute = false;
@ -149,10 +148,8 @@ public class WebSocketUpgradeFilter implements Filter, MappedWebSocketCreator, D
@Override
public void destroy()
{
LOG.info(".destroy()");
try
{
context.setAttribute(instanceKey, null);
alreadySetToAttribute = false;
if(localConfiguration)
{
@ -290,8 +287,6 @@ public class WebSocketUpgradeFilter implements Filter, MappedWebSocketCreator, D
@Override
public void init(FilterConfig config) throws ServletException
{
LOG.info(".init()");
try
{
String configurationKey = config.getInitParameter(CONFIG_ATTRIBUTE_KEY);
@ -356,8 +351,6 @@ public class WebSocketUpgradeFilter implements Filter, MappedWebSocketCreator, D
instanceKey = WebSocketUpgradeFilter.class.getName();
}
this.context = config.getServletContext();
// Set instance of this filter to context attribute
setToAttribute(config.getServletContext(), instanceKey);
}