Skip to content
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

Jump to bottom

Cherry pick jdk17 modules fix onto 4.9.x #6742

Merged
merged 1 commit into from Jul 17, 2021
Merged

Cherry pick jdk17 modules fix onto 4.9.x #6742

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions okhttp/src/main/kotlin/okhttp3/internal/platform/Platform.kt
View file
Open in desktop
Expand Up @@ -94,6 +94,14 @@ open class Platform {
val context = readFieldOrNull(sslSocketFactory, sslContextClass, "context") ?: return null
readFieldOrNull(context, X509TrustManager::class.java, "trustManager")
} catch (e: ClassNotFoundException) {
null
} catch (e: RuntimeException) {
// Throws InaccessibleObjectException (added in JDK9) on JDK 17 due to
// JEP 403 Strongly Encapsulate JDK Internals.
if (e.javaClass.name != "java.lang.reflect.InaccessibleObjectException") {
throw e
}

null
}
}
Expand Down