Skip to content

Commit 7bdce8e

Browse files
committed
add null check to generateRequest1
1 parent 26dac66 commit 7bdce8e

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,15 @@ 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
}
131133
populateContentAndContentType(
132134
v1Request.getBody(),
133-
v1Request.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE),
135+
contentType,
134136
v1Request.isBase64Encoded(),
135137
httpRequest
136138
);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,15 @@ private static HttpServletRequest generateRequest1(String request, Context lambd
125125
populateQueryStringParametersV1(v1Request, httpRequest);
126126
populateMultiValueQueryStringParametersV1(v1Request, httpRequest);
127127

128+
String contentType = null;
128129
if (v1Request.getMultiValueHeaders() != null) {
129130
MultiValueMapAdapter headers = new MultiValueMapAdapter(v1Request.getMultiValueHeaders());
130131
httpRequest.setHeaders(headers);
132+
contentType = v1Request.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE);
131133
}
132134
populateContentAndContentType(
133135
v1Request.getBody(),
134-
v1Request.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE),
136+
contentType,
135137
v1Request.isBase64Encoded(),
136138
httpRequest
137139
);

0 commit comments

Comments
 (0)