Author: markt
Date: Tue Jul 2 09:40:26 2013
New Revision: 1498857
URL: http://svn.apache.org/r1498857
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55165
Ensure sub-protocols are processed for annotated endpoint.
Patch provided by Niki Dokovski.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1498857&r1=1498856&r2=1498857&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Tue Jul 2 09:40:26 2013
@@ -235,6 +235,7 @@ public class WsServerContainer extends W
sec = ServerEndpointConfig.Builder.create(pojo, path).
decoders(Arrays.asList(annotation.decoders())).
encoders(Arrays.asList(annotation.encoders())).
+ subprotocols(Arrays.asList(annotation.subprotocols())).
configurator(configurator).
build();
sec.getUserProperties().put(
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
