418603 - cannot specify a custom ServerEndpointConfig.Configurator

+ Fixing bad assumption on annotations possibly being null
2013-10-03 09:12:53 -07:00 · 2013-10-03 09:12:53 -07:00 · d2c3d7cf09
parent 562cf009f0
commit d2c3d7cf09
1 changed files with 1 additions and 1 deletions
--- a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/AnnotatedServerEndpointConfig.java
+++ b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/AnnotatedServerEndpointConfig.java
@ -110,7 +110,7 @@ public class AnnotatedServerEndpointConfig implements ServerEndpointConfig
            userProperties.putAll(baseConfig.getUserProperties());
        }

-        if (anno.configurator() == null)
+        if (anno.configurator() == ServerEndpointConfig.Configurator.class)
        {
            if (configr != null)
            {