You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/04/19 17:33:48 UTC
svn commit: r1469905 - in /tomcat/trunk:
java/org/apache/tomcat/websocket/server/WsServerContainer.java
test/org/apache/tomcat/websocket/server/TestServerContainerImpl.java
Author: markt
Date: Fri Apr 19 15:33:48 2013
New Revision: 1469905
URL: http://svn.apache.org/r1469905
Log:
No longer using Servlet mappings
Removed:
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestServerContainerImpl.java
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=1469905&r1=1469904&r2=1469905&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java Fri Apr 19 15:33:48 2013
@@ -286,32 +286,6 @@ public class WsServerContainer extends W
}
- /**
- * Converts a path defined for a WebSocket endpoint into a path that can be
- * used as a servlet mapping.
- *
- * @param wsPath The WebSocket endpoint path to convert
- * @return The servlet mapping
- */
- static String getServletPath(String wsPath) {
- int templateStart = wsPath.indexOf('{');
- if (templateStart == -1) {
- if (wsPath.charAt(wsPath.length() - 1) == '/') {
- return wsPath + '*';
- } else {
- return wsPath + "/*";
- }
- } else {
- String temp = wsPath.substring(0, templateStart);
- if (temp.charAt(temp.length() - 1) == '/') {
- return temp + '*';
- } else {
- return temp.substring(0, temp.lastIndexOf('/') + 1) + '*';
- }
- }
- }
-
-
private static class TemplatePathMatch {
private final ServerEndpointConfig config;
private final UriTemplate uriTemplate;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org