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/08/18 20:19:28 UTC
svn commit: r1515192 - in /tomcat/tc7.0.x/trunk/modules/websocket: ./
java/org/apache/tomcat/websocket/server/LocalStrings.properties
java/org/apache/tomcat/websocket/server/UriTemplate.java
test/org/apache/tomcat/websocket/server/TestUriTemplate.java
Author: markt
Date: Sun Aug 18 18:19:28 2013
New Revision: 1515192
URL: http://svn.apache.org/r1515192
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55434
Ensure only duplicate parameters rather than duplicate segments trigger an error.
Modified:
tomcat/tc7.0.x/trunk/modules/websocket/ (props changed)
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/LocalStrings.properties
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/UriTemplate.java
tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/server/TestUriTemplate.java
Propchange: tomcat/tc7.0.x/trunk/modules/websocket/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1515191
Modified: tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/LocalStrings.properties?rev=1515192&r1=1515191&r2=1515192&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/LocalStrings.properties (original)
+++ tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/LocalStrings.properties Sun Aug 18 18:19:28 2013
@@ -25,6 +25,7 @@ serverContainer.pojoDeploy=POJO class [{
serverContainer.servletContextMismatch=Attempted to register a POJO annotated for WebSocket at path [{0}] in the ServletContext with context path [{1}] when the WebSocket ServerContainer is allocated to the ServletContext with context path [{2}]
serverContainer.servletContextMissing=No ServletContext was specified
+uriTemplate.duplicateParameter=The parameter [{0}] appears more than once in the path which is not permitted
uriTemplate.invalidPath=The path [{0}] is not valid.
uriTemplate.invalidSegment=The segment [{0}] is not valid in the provided path [{1}]
Modified: tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/UriTemplate.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/UriTemplate.java?rev=1515192&r1=1515191&r2=1515192&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/UriTemplate.java (original)
+++ tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/UriTemplate.java Sun Aug 18 18:19:28 2013
@@ -16,10 +16,13 @@
*/
package org.apache.tomcat.websocket.server;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.websocket.DeploymentException;
@@ -35,7 +38,7 @@ public class UriTemplate {
StringManager.getManager(Constants.PACKAGE_NAME);
private final String normalized;
- private final Map<String,Segment> segments = new LinkedHashMap<String, Segment>();
+ private final List<Segment> segments = new ArrayList<Segment>();
private final boolean hasParameters;
@@ -47,6 +50,7 @@ public class UriTemplate {
}
StringBuilder normalized = new StringBuilder(path.length());
+ Set<String> paramNames = new HashSet<String>();
String[] segments = path.split("/");
int paramCount = 0;
@@ -65,6 +69,10 @@ public class UriTemplate {
normalized.append('{');
normalized.append(paramCount++);
normalized.append('}');
+ if (!paramNames.add(segment)) {
+ throw new IllegalArgumentException(sm.getString(
+ "uriTemplate.duplicateParameter", segment));
+ }
} else {
if (segment.contains("{") || segment.contains("}")) {
throw new IllegalArgumentException(sm.getString(
@@ -72,12 +80,7 @@ public class UriTemplate {
}
normalized.append(segment);
}
- Segment old =
- this.segments.put(segment, new Segment(index, segment));
- if (old != null) {
- throw new IllegalArgumentException(
- sm.getString("uriTemplate.duplicateName", segment));
- }
+ this.segments.add(new Segment(index, segment));
segmentCount++;
}
@@ -96,8 +99,8 @@ public class UriTemplate {
}
Iterator<Segment> candidateSegments =
- candidate.getSegments().values().iterator();
- Iterator<Segment> targetSegments = segments.values().iterator();
+ candidate.getSegments().iterator();
+ Iterator<Segment> targetSegments = segments.iterator();
while (candidateSegments.hasNext()) {
Segment candidateSegment = candidateSegments.next();
@@ -136,7 +139,7 @@ public class UriTemplate {
}
- private Map<String,Segment> getSegments() {
+ private List<Segment> getSegments() {
return segments;
}
Modified: tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/server/TestUriTemplate.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/server/TestUriTemplate.java?rev=1515192&r1=1515191&r2=1515192&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/server/TestUriTemplate.java (original)
+++ tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/server/TestUriTemplate.java Sun Aug 18 18:19:28 2013
@@ -141,7 +141,7 @@ public class TestUriTemplate {
Map<String,String> result = t.match(new UriTemplate("/a"));
Assert.assertNull(result);
- }
+ }
@Test
@@ -150,12 +150,23 @@ public class TestUriTemplate {
Map<String,String> result = t.match(new UriTemplate("/a/b/c"));
Assert.assertNull(result);
- }
+ }
@Test(expected=java.lang.IllegalArgumentException.class)
- public void testDuplicate() throws Exception {
+ public void testDuplicate01() throws Exception {
@SuppressWarnings("unused")
UriTemplate t = new UriTemplate("/{var}/{var}");
- }
+ }
+
+
+ @Test
+ public void testDuplicate02() throws Exception {
+ UriTemplate t = new UriTemplate("/{a}/{b}");
+ Map<String,String> result = t.match(new UriTemplate("/x/x"));
+
+ Assert.assertEquals(2, result.size());
+ Assert.assertEquals("x", result.get("a"));
+ Assert.assertEquals("x", result.get("b"));
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org