Skip to content

Commit a00116c

Browse files
committed
Revert "Handle null for client override execution attributes"
This reverts commit 4b07326.
1 parent 56eda1f commit a00116c

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsClientHandlerUtils.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.nio.ByteBuffer;
2323
import java.time.Duration;
2424
import java.util.Map;
25-
import java.util.Optional;
2625
import java.util.stream.Collectors;
2726
import software.amazon.awssdk.annotations.SdkProtectedApi;
2827
import software.amazon.awssdk.auth.credentials.AwsCredentials;
@@ -101,8 +100,7 @@ static <InputT extends SdkRequest, OutputT extends SdkResponse> ExecutionContext
101100
.putAttribute(SdkInternalExecutionAttribute.DISABLE_HOST_PREFIX_INJECTION,
102101
clientConfig.option(SdkAdvancedClientOption.DISABLE_HOST_PREFIX_INJECTION));
103102

104-
Optional.ofNullable(clientConfig.option(SdkClientOption.EXECUTION_ATTRIBUTES)).ifPresent(clientOverrideConfiguration ->
105-
executionAttributes.putAllAttributes(clientOverrideConfiguration));
103+
executionAttributes.putAllAttributes(clientConfig.option(SdkClientOption.EXECUTION_ATTRIBUTES));
106104
originalRequest.overrideConfiguration().ifPresent(requestOverrideConfiguration ->
107105
executionAttributes.putAllAttributes(requestOverrideConfiguration.executionAttributes()));
108106

0 commit comments

Comments
 (0)