Author: schultz
Date: Mon Mar 9 16:21:15 2015
New Revision: 1665292
URL: http://svn.apache.org/r1665292
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57676
Improve error message when multiple Websocket endpoints are bound to the same
path.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties?rev=1665292&r1=1665291&r2=1665292&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
Mon Mar 9 16:21:15 2015
@@ -14,7 +14,7 @@
# limitations under the License.
serverContainer.addNotAllowed=No further Endpoints may be registered once an
attempt has been made to use one of the previously registered endpoints
serverContainer.configuratorFail=Failed to create configurator of type [{0}]
for POJO of type [{1}]
-serverContainer.duplicatePaths=Multiple Endpoints may not be deployed to the
same path [{0}]
+serverContainer.duplicatePaths=Multiple Endpoints may not be deployed to the
same path [{0}] : existing endpoint was {1} and new endpoint is {2}
serverContainer.encoderFail=Unable to create encoder of type [{0}]
serverContainer.endpointDeploy=Endpoint class [{0}] deploying to path [{1}] in
ServletContext [{2}]
serverContainer.missingAnnotation=Cannot deploy POJO class [{0}] as it is not
annotated with @ServerEndpoint
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=1665292&r1=1665291&r2=1665292&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Mon Mar 9 16:21:15 2015
@@ -200,7 +200,9 @@ public class WsServerContainer extends W
if (!templateMatches.add(new TemplatePathMatch(sec, uriTemplate)))
{
// Duplicate uriTemplate;
throw new DeploymentException(
- sm.getString("serverContainer.duplicatePaths", path));
+ sm.getString("serverContainer.duplicatePaths", path,
+ sec.getEndpointClass(),
+ sec.getEndpointClass()));
}
} else {
// Exact match
@@ -208,7 +210,9 @@ public class WsServerContainer extends W
if (old != null) {
// Duplicate path mappings
throw new DeploymentException(
- sm.getString("serverContainer.duplicatePaths", path));
+ sm.getString("serverContainer.duplicatePaths", path,
+ old.getEndpointClass(),
+ sec.getEndpointClass()));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
