Skip to content

Commit 583ccb5

Browse files
committed
Critical bug fix for nulll query string parameter map in API Gateway's event.
1 parent 7338ec3 commit 583ccb5

File tree

2 files changed

+6
-2
lines changed
  • aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet
  • aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/echoapp

2 files changed

+6
-2
lines changed

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,11 @@ public String[] getParameterValues(String s) {
476476
paramKey = paramKey.toLowerCase(Locale.getDefault());
477477
}
478478
List<String> values = new ArrayList<>();
479-
values.addAll(queryStringParameters.get(paramKey));
479+
List<String> queryParamValues = queryStringParameters.get(paramKey);
480+
if (queryParamValues != null) {
481+
values.addAll(queryParamValues);
482+
}
483+
//values.addAll(queryStringParameters.get(paramKey));
480484

481485
String[] formBodyValues = getFormBodyParameterCaseInsensitive(s);
482486
if (formBodyValues != null) {

aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/echoapp/EchoResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public MapResponseModel echoServletHeaders(HttpServletRequest context) {
5858
}
5959

6060
@RequestMapping(path = "/query-string", method = RequestMethod.GET)
61-
public MapResponseModel echoQueryString(HttpServletRequest request) {
61+
public MapResponseModel echoQueryString(HttpServletRequest request, @RequestParam(value="nonexistent", required=false) String nonexistentParamValue) {
6262
MapResponseModel queryStrings = new MapResponseModel();
6363
for (String key : request.getParameterMap().keySet()) {
6464
queryStrings.addValue(key, request.getParameterMap().get(key)[0]);

0 commit comments

Comments
 (0)