| commit | d2c3d7cf09c2e018a4439dec2c09d9eca7da0a26 | [log] [tgz] |
|---|---|---|
| author | Joakim Erdfelt <joakim.erdfelt@gmail.com> | Thu Oct 03 09:12:53 2013 -0700 |
| committer | Joakim Erdfelt <joakim.erdfelt@gmail.com> | Thu Oct 03 09:13:37 2013 -0700 |
| tree | 32a41e4147f9be07b912d2908a09af9c865e89cd | |
| parent | 562cf009f0020024f79855a9ed49f9d9c33d8bcc [diff] |
418603 - cannot specify a custom ServerEndpointConfig.Configurator + Fixing bad assumption on annotations possibly being null
diff --git 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 index 6846991..4652e9d 100644 --- 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 @@ userProperties.putAll(baseConfig.getUserProperties()); } - if (anno.configurator() == null) + if (anno.configurator() == ServerEndpointConfig.Configurator.class) { if (configr != null) {