Skip to content

Commit 08fe81c

Browse files
committed
Revert " Upgrade Okie to version 3.6.0 and OkHttp to version 4.12.0"
This reverts commit 01bdab4.
1 parent 4464129 commit 08fe81c

File tree

6 files changed

+7
-701
lines changed

6 files changed

+7
-701
lines changed

pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dep.slice.version>0.38</dep.slice.version>
5050
<dep.testing-mysql-server-5.version>0.6</dep.testing-mysql-server-5.version>
5151
<dep.aws-sdk.version>1.12.560</dep.aws-sdk.version>
52-
<dep.okhttp.version>4.12.0</dep.okhttp.version>
52+
<dep.okhttp.version>3.9.0</dep.okhttp.version>
5353
<dep.jdbi3.version>3.4.0</dep.jdbi3.version>
5454
<dep.oracle.version>19.3.0.0</dep.oracle.version>
5555
<dep.drift.version>1.40</dep.drift.version>
@@ -2554,7 +2554,6 @@
25542554
<exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
25552555
<exclude>com.fasterxml.jackson.core:jackson-core</exclude>
25562556
<exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
2557-
<exclude>org.jetbrains.kotlin:kotlin-stdlib-jdk8</exclude>
25582557
</excludes>
25592558
</requireUpperBoundDeps>
25602559
</rules>

presto-client/src/main/java/com/facebook/presto/client/JsonResponse.java

+6
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import javax.annotation.Nullable;
2525

2626
import java.io.IOException;
27+
import java.io.InterruptedIOException;
2728
import java.io.UncheckedIOException;
2829

2930
import static com.google.common.base.MoreObjects.toStringHelper;
@@ -145,6 +146,11 @@ public static <T> JsonResponse<T> execute(JsonCodec<T> codec, OkHttpClient clien
145146
return new JsonResponse<>(response.code(), response.message(), response.headers(), body);
146147
}
147148
catch (IOException e) {
149+
// OkHttp throws this after clearing the interrupt status
150+
// TODO: remove after updating to Okio 1.15.0+
151+
if ((e instanceof InterruptedIOException) && "thread interrupted".equals(e.getMessage())) {
152+
Thread.currentThread().interrupt();
153+
}
148154
throw new UncheckedIOException(e);
149155
}
150156
}

presto-client/src/main/java/com/facebook/presto/client/OkHttpUtil.java

-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import com.facebook.airlift.security.pem.PemReader;
1717
import com.google.common.base.CharMatcher;
1818
import com.google.common.net.HostAndPort;
19-
import okhttp.internal.tls.LegacyHostnameVerifier;
2019
import okhttp3.Call;
2120
import okhttp3.Callback;
2221
import okhttp3.Credentials;
@@ -238,7 +237,6 @@ public static void setupSsl(
238237
sslContext.init(keyManagers, new TrustManager[] {trustManager}, null);
239238

240239
clientBuilder.sslSocketFactory(sslContext.getSocketFactory(), trustManager);
241-
clientBuilder.hostnameVerifier(LegacyHostnameVerifier.INSTANCE);
242240
}
243241
catch (GeneralSecurityException | IOException e) {
244242
throw new ClientException("Error setting up SSL: " + e.getMessage(), e);

0 commit comments

Comments
 (0)