Handle null return from ExtendedSSLSession.getRequestedServerNames on Android SDK 27/28#9525
Open
tsushanth wants to merge 1 commit into
Open
Handle null return from ExtendedSSLSession.getRequestedServerNames on Android SDK 27/28#9525tsushanth wants to merge 1 commit into
tsushanth wants to merge 1 commit into
Conversation
On Android SDK 27/28, getRequestedServerNames() can return null instead of an empty list (see google/conscrypt#977). Guard with ?: emptyList() so MockWebServer no longer throws NPE on affected emulator versions. Fixes square#9523
yschimke
approved these changes
Jul 5, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #9523.
On Android SDK 27 and 28,
ExtendedSSLSession.getRequestedServerNames()can returnnullinstead of an empty list (upstream bug: google/conscrypt#977). This causes aNullPointerExceptioninMockWebServerwhen recordingrequestedServerNameson aRecordedRequest.Change: one-line null guard in
Platform.getHandshakeServerNames— replace direct.mapNotNullcall with(session.requestedServerNames ?: emptyList()).mapNotNull { ... }. Already catchesUnsupportedOperationExceptionin the same block, so the null case fits the same defensive pattern.