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

418603 - cannot specify a custom ServerEndpointConfig.Configurator 

+ Fixing bad assumption on annotations possibly being null
This commit is contained in:
Joakim Erdfelt 2013-10-03 09:12:53 -07:00
parent 562cf009f0
commit d2c3d7cf09
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/AnnotatedServerEndpointConfig.java
View File

@ -110,7 +110,7 @@ public class AnnotatedServerEndpointConfig implements ServerEndpointConfig
userProperties.putAll(baseConfig.getUserProperties()); userProperties.putAll(baseConfig.getUserProperties());
} }
if (anno.configurator() == null) if (anno.configurator() == ServerEndpointConfig.Configurator.class)
{ {
if (configr != null) if (configr != null)
{ {