--- java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java	(revision 1710467)
+++ java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java	(working copy)
@@ -76,10 +76,11 @@ 
                     Collections.unmodifiableList(
                             Arrays.asList(entry.getValue())));
         }
-        for (String pathName : pathParams.keySet()) {
+        for (Entry<String,String> entry : pathParams.entrySet()) {
+            final String pathName = entry.getKey();
             newParameters.put(pathName,
                     Collections.unmodifiableList(
-                            Arrays.asList(pathParams.get(pathName))));
+                            Arrays.asList(entry.getValue())));
         }
         parameterMap = Collections.unmodifiableMap(newParameters);