Skip to content

Commit 24b5bba

Browse files
committed
UrlConnectionSdkHttpService should have higher priorty than AwsCrtSdkHttpService
1 parent 3d05485 commit 24b5bba

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/ClasspathSdkHttpServiceProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ final class ClasspathSdkHttpServiceProvider<T> implements SdkHttpServiceProvider
3939
static final Map<String, Integer> SYNC_HTTP_SERVICES_PRIORITY =
4040
ImmutableMap.<String, Integer>builder()
4141
.put("software.amazon.awssdk.http.apache.ApacheSdkHttpService", 1)
42-
.put("software.amazon.awssdk.http.crt.AwsCrtSdkHttpService", 2)
43-
.put("software.amazon.awssdk.http.urlconnection.UrlConnectionSdkHttpService", 3)
42+
.put("software.amazon.awssdk.http.urlconnection.UrlConnectionSdkHttpService", 2)
43+
.put("software.amazon.awssdk.http.crt.AwsCrtSdkHttpService", 3)
4444
.build();
4545

4646
static final Map<String, Integer> ASYNC_HTTP_SERVICES_PRIORITY =
@@ -94,7 +94,7 @@ private String logServices(Queue<T> impls) {
9494
String message = count == 1 ? "The HTTP implementation loaded is " + impl :
9595
String.format(
9696
"Multiple HTTP implementations were found on the classpath. The SDK will use %s since it has the "
97-
+ "highest. The multiple implementations found were: %s",
97+
+ "highest priority. The multiple implementations found were: %s",
9898
impl,
9999
implText);
100100

test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3BaseStabilityTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public abstract class S3BaseStabilityTest extends AwsTestBase {
5858

5959

6060
// The JVM does a bunch under the hood, so leave some room for magic.
61-
private static final int ALLOWED_THREAD_OVERHEAD = 20;
61+
private static final int ALLOWED_THREAD_OVERHEAD = 50;
6262

6363
protected int allowedPeakThreads;
6464

0 commit comments

Comments
 (0)