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

Revert "Issue #660 - simplifying parameter extraction to prevent NPE" 

This reverts commit ecea486d07.
This commit is contained in:
Greg Wilkins 2016-06-23 12:43:29 +10:00
parent 67f8a96eee
commit c3173932f0
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
View File

@ -1012,9 +1012,16 @@ public class Request implements HttpServletRequest
if (_queryParameters == null)
extractQueryParameters();
_parameters = new MultiMap<>();
_parameters.addAllValues(_queryParameters);
_parameters.addAllValues(_contentParameters);
if (_queryParameters==NO_PARAMS || _queryParameters.size()==0)
_parameters=_contentParameters;
else if (_contentParameters==NO_PARAMS || _contentParameters.size()==0)
_parameters=_queryParameters;
else
{
_parameters = new MultiMap<>();
_parameters.addAllValues(_queryParameters);
_parameters.addAllValues(_contentParameters);
}
}
/* ------------------------------------------------------------ */