Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
This commit is contained in:
commit
e3936d2046
|
@ -1016,9 +1016,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);
|
||||
}
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------ */
|
||||
|
|
Loading…
Reference in New Issue