Skip to content

disable socket factory pre JDK8u242 #5915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
PennyAndWang wants to merge 1 commit into from
Closed

disable socket factory pre JDK8u242 #5915

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions presto-client/src/main/java/io/prestosql/client/OkHttpUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
package io.prestosql.client;

import com.google.common.base.CharMatcher;
import com.google.common.base.Splitter;
import com.google.common.base.StandardSystemProperty;
import com.google.common.collect.ImmutableList;
import com.google.common.net.HostAndPort;
Expand Down Expand Up @@ -246,22 +245,16 @@ public static void setupSsl(

public static void setupChannelSocket(OkHttpClient.Builder clientBuilder)
{
// Enable socket factory only for pre JDK 11
if (!isAtLeastJava11()) {
// Enable socket factory only for pre JDK8u242
if (!isAtLeastJava8u242()) {
clientBuilder.socketFactory(new SocketChannelSocketFactory());
clientBuilder.protocols(ImmutableList.of(Protocol.HTTP_1_1));
}
}

private static boolean isAtLeastJava11()
private static boolean isAtLeastJava8u242()
{
String feature = Splitter.on(".").split(StandardSystemProperty.JAVA_VERSION.value()).iterator().next();
try {
return Integer.parseInt(feature) >= 11;
}
catch (NumberFormatException e) {
return false;
}
return StandardSystemProperty.JAVA_VERSION.value().compareTo("1.8.0_242") > 0;
}

private static void validateCertificates(KeyStore keyStore)
Expand Down