Skip to content

Commit f8f4d83

Browse files
committed
Update AwsSpringHttpProcessingUtils.java
Corrected NullPointerException identified in bug 1504
1 parent e8b5aa7 commit f8f4d83

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

aws-serverless-java-container-springboot3/src/main/java/com/amazonaws/serverless/proxy/spring/AwsSpringHttpProcessingUtils.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,18 @@ private static HttpServletRequest generateRequest1(String request, Context lambd
124124
populateQueryStringParametersV1(v1Request, httpRequest);
125125
populateMultiValueQueryStringParametersV1(v1Request, httpRequest);
126126

127+
String contentType = null;
127128
if (v1Request.getMultiValueHeaders() != null) {
128129
MultiValueMapAdapter headers = new MultiValueMapAdapter(v1Request.getMultiValueHeaders());
129130
httpRequest.setHeaders(headers);
131+
contentType = v1Request.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE);
130132
}
131-
populateContentAndContentType(
132-
v1Request.getBody(),
133-
v1Request.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE),
134-
v1Request.isBase64Encoded(),
135-
httpRequest
136-
);
133+
populateContentAndContentType(
134+
v1Request.getBody(),
135+
contentType,
136+
v1Request.isBase64Encoded(),
137+
httpRequest
138+
);
137139
if (v1Request.getRequestContext() != null) {
138140
httpRequest.setAttribute(RequestReader.API_GATEWAY_CONTEXT_PROPERTY, v1Request.getRequestContext());
139141
httpRequest.setAttribute(RequestReader.ALB_CONTEXT_PROPERTY, v1Request.getRequestContext().getElb());

0 commit comments

Comments
 (0)