Skip to content

Commit 80a6a5a

Browse files
authored
CRT HTTP/1 GA - Surface Area Updates - Timeout (#3711)
* Removed CRT connection timeout * Remove empty Map
1 parent 9ceff29 commit 80a6a5a

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"category": "AWS CRT HTTP Client",
3+
"contributor": "",
4+
"type": "feature",
5+
"description": "Remove CRT connection timeout default"
6+
}

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClient.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,6 @@ public final class AwsCrtAsyncHttpClient implements SdkAsyncHttpClient {
7676
private static final String AWS_COMMON_RUNTIME = "AwsCommonRuntime";
7777
private static final int DEFAULT_STREAM_WINDOW_SIZE = 16 * 1024 * 1024; // 16 MB
7878

79-
private static final Duration CRT_SDK_DEFAULT_CONNECTION_TIMEOUT = Duration.ofSeconds(3);
80-
// Override default connection timeout for Crt client to be in line with the CRT default:
81-
// https://github.com/awslabs/aws-crt-java/blob/main/src/main/java/software/amazon/awssdk/crt/io/SocketOptions.java#L79
82-
private static final AttributeMap CRT_HTTP_DEFAULTS =
83-
AttributeMap.builder()
84-
.put(SdkHttpConfigurationOption.CONNECTION_TIMEOUT, CRT_SDK_DEFAULT_CONNECTION_TIMEOUT)
85-
.build();
86-
8779
private final Map<URI, HttpClientConnectionManager> connectionPools = new ConcurrentHashMap<>();
8880
private final LinkedList<CrtResource> ownedSubResources = new LinkedList<>();
8981
private final ClientBootstrap bootstrap;
@@ -437,15 +429,13 @@ private DefaultBuilder() {
437429
@Override
438430
public SdkAsyncHttpClient build() {
439431
return new AwsCrtAsyncHttpClient(this, standardOptions.build()
440-
.merge(CRT_HTTP_DEFAULTS)
441432
.merge(SdkHttpConfigurationOption.GLOBAL_HTTP_DEFAULTS));
442433
}
443434

444435
@Override
445436
public SdkAsyncHttpClient buildWithDefaults(AttributeMap serviceDefaults) {
446437
return new AwsCrtAsyncHttpClient(this, standardOptions.build()
447438
.merge(serviceDefaults)
448-
.merge(CRT_HTTP_DEFAULTS)
449439
.merge(SdkHttpConfigurationOption.GLOBAL_HTTP_DEFAULTS));
450440
}
451441

0 commit comments

Comments
 (0)