Fix tlschannel.util.Util.getJavaMajorVersion
#969
Merged
Conversation
This file contains 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
This is a manual cherry-pick and squash of the following commits: - marianobarrios/tls-channel@3b5f8a0 - marianobarrios/tls-channel@f4b780e JAVA-4656
stIncMale
requested review from
katcharov and
jyemin
and removed request for
jyemin
rozza
approved these changes
Jun 22, 2022
stIncMale
commented
Jun 23, 2022
| int dotPos = version.indexOf('.'); | ||
| int dashPos = version.indexOf('-'); | ||
| return Integer.parseInt( | ||
| version.substring(0, dotPos > -1 ? dotPos : dashPos > -1 ? dashPos : version.length())); |
There was a problem hiding this comment.
The only way we deviate here from the algorithm in tls-channel is that instead of using 1 at the end of this line, we use version.length(). Without this change "17" is parsed as 1, which then causes class loading issues with the root cause being swallowed and not being present in the logs.
I'll create a PR for tls-channel when this PR is approved.
jyemin
requested changes
Jun 23, 2022
| () -> assertEquals(9, Util.getJavaMajorVersion("9-ea")), | ||
| () -> assertEquals(9, Util.getJavaMajorVersion("9")), | ||
| () -> assertEquals(9, Util.getJavaMajorVersion("9.0.1")), | ||
| () -> assertEquals(17, Util.getJavaMajorVersion("17")), |
There was a problem hiding this comment.
Can we add a test for a double digit early access, e.g. 19-ea?
There was a problem hiding this comment.
When Java 8 dies off, everyone will be able to use Runtime.version().feature() instead of writing his own Util.getJavaMajorVersion.
Done.
JAVA-4656
jyemin
approved these changes
Jun 23, 2022
stIncMale
added a commit
that referenced
this pull request
Jun 23, 2022
This is a combination of a manual cherry-pick and squash of the following commits: - marianobarrios/tls-channel@3b5f8a0 - marianobarrios/tls-channel@f4b780e and a small fix on top of that. JAVA-4656
ispringer
pushed a commit
to evergage/mongo-java-driver
that referenced
this pull request
May 16, 2023
This is a combination of a manual cherry-pick and squash of the following commits: - marianobarrios/tls-channel@3b5f8a0 - marianobarrios/tls-channel@f4b780e and a small fix on top of that. JAVA-4656
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is a manual cherry-pick and squash of the following commits:
We don't test against JDK 18, and definitely not against early access builds. A manual test confirms that
18-eamentioned is the ticket is parsed successfully by the updated code.The ticket does not specify the version the client uses. I am planning to backport the fix only to 4.6.x.
JAVA-4656