Author: kfujino
Date: Thu May 31 08:26:43 2018
New Revision: 1832586
URL: http://svn.apache.org/viewvc?rev=1832586&view=rev
Log:
When decoding of path parameter failed, make sure to throw DecodeException
instead of throwing ArrayIndexOutOfBoundsException.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java?rev=1832586&r1=1832585&r2=1832586&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Thu May 31 08:26:43 2018
@@ -645,6 +645,7 @@ public class PojoMethodMapping {
"pojoMethodMapping.decodePathParamFail",
valueString, pathParam.getType()), e);
params = new Object[] { de };
+ break;
}
params[entry.getKey().intValue()] = value;
}
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1832586&r1=1832585&r2=1832586&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu May 31 08:26:43 2018
@@ -175,6 +175,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="WebSocket">
+ <changelog>
+ <fix>
+ When decoding of path parameter failed, make sure to throw
+ <code>DecodeException</code> instead of throwing
+ <code>ArrayIndexOutOfBoundsException</code>. (kfujino)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Web applications">
<changlog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
