Skip to content

Commit 27a9180

Browse files
committed
Handle null response metadata
1 parent 8472539 commit 27a9180

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsResponseMetadata.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import static software.amazon.awssdk.awscore.util.AwsHeader.AWS_REQUEST_ID;
1919

2020
import java.util.Collections;
21+
import java.util.HashMap;
2122
import java.util.Map;
2223
import java.util.Objects;
2324
import java.util.Optional;
@@ -48,7 +49,7 @@ protected AwsResponseMetadata(Map<String, String> metadata) {
4849
}
4950

5051
protected AwsResponseMetadata(AwsResponseMetadata responseMetadata) {
51-
this(responseMetadata.metadata);
52+
this(responseMetadata == null ? new HashMap<>() : responseMetadata.metadata);
5253
}
5354

5455
/**

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/multipart/SdkPojoConversionUtils.java

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,8 @@ public static CopyObjectResponse toCopyObjectResponse(CompleteMultipartUploadRes
131131

132132
setSdkFields(builder, response);
133133

134-
if (response.responseMetadata() != null) {
135-
builder.responseMetadata(response.responseMetadata());
136-
}
137-
138-
if (response.sdkHttpResponse() != null) {
139-
builder.sdkHttpResponse(response.sdkHttpResponse());
140-
}
134+
builder.responseMetadata(response.responseMetadata());
135+
builder.sdkHttpResponse(response.sdkHttpResponse());
141136

142137
return builder.copyObjectResult(toCopyObjectResult(response))
143138
.build();
@@ -184,14 +179,8 @@ public static PutObjectResponse toPutObjectResponse(CompleteMultipartUploadRespo
184179

185180
setSdkFields(builder, response);
186181

187-
// TODO: check why we have to do null check
188-
if (response.responseMetadata() != null) {
189-
builder.responseMetadata(response.responseMetadata());
190-
}
191-
192-
if (response.sdkHttpResponse() != null) {
193-
builder.sdkHttpResponse(response.sdkHttpResponse());
194-
}
182+
builder.responseMetadata(response.responseMetadata());
183+
builder.sdkHttpResponse(response.sdkHttpResponse());
195184

196185
return builder.build();
197186
}

0 commit comments

Comments
 (0)