Skip to content

Commit a78943f

Browse files
committed
Null check for clientOverrideConfiguration
1 parent 878b2e5 commit a78943f

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkDefaultClientBuilder.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -329,13 +329,16 @@ private RequestCompressionConfiguration resolveRequestCompressionConfiguration()
329329
Integer minCompressionThreshold = null;
330330

331331
// Client level
332-
RequestCompressionConfiguration clientConfig =
333-
clientOverrideConfiguration.requestCompressionConfiguration().orElse(null);
334-
if (clientConfig != null) {
335-
requestCompressionEnabled = clientConfig.requestCompressionEnabled();
336-
minCompressionThreshold = clientConfig.minimumCompressionThresholdInBytes();
332+
if (clientOverrideConfiguration != null) {
333+
RequestCompressionConfiguration clientConfig =
334+
clientOverrideConfiguration.requestCompressionConfiguration().orElse(null);
335+
if (clientConfig != null) {
336+
requestCompressionEnabled = clientConfig.requestCompressionEnabled();
337+
minCompressionThreshold = clientConfig.minimumCompressionThresholdInBytes();
338+
}
337339
}
338340

341+
339342
// Env level
340343
if (requestCompressionEnabled == null) {
341344
Optional<Boolean> systemSetting = SdkSystemSetting.AWS_DISABLE_REQUEST_COMPRESSION.getBooleanValue();

0 commit comments

Comments
 (0)