Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Greg Wilkins 2017-10-20 11:09:48 +11:00
parent 71c78db60e 3c6934c24b
commit af80b2c044
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
View File

@ -610,7 +610,7 @@ public class HttpURI
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public void decodeQueryTo(MultiMap<String> parameters) public void decodeQueryTo(MultiMap<String> parameters)
{ {
if (_query==_fragment) if (_query==null)
return; return;
UrlEncoded.decodeUtf8To(_query,parameters); UrlEncoded.decodeUtf8To(_query,parameters);
} }
@ -624,7 +624,7 @@ public class HttpURI
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public void decodeQueryTo(MultiMap<String> parameters, Charset encoding) throws UnsupportedEncodingException public void decodeQueryTo(MultiMap<String> parameters, Charset encoding) throws UnsupportedEncodingException
{ {
if (_query==_fragment) if (_query==null)
return; return;
if (encoding==null || StandardCharsets.UTF_8.equals(encoding)) if (encoding==null || StandardCharsets.UTF_8.equals(encoding))