Skip to content

Commit

Permalink
8294837: unify Windows 2019 version check in os_windows and java_prop…
Browse files Browse the repository at this point in the history
…s_md

Reviewed-by: alanb, rriggs
  • Loading branch information
MBaesken committed Oct 6, 2022
1 parent 8c15f77 commit 7012d4b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/java.base/windows/native/libjava/java_props_md.c
Expand Up @@ -558,7 +558,7 @@ GetJavaProperties(JNIEnv* env)
/* Windows server 2022 build number is 20348 */
if (buildNumber > 20347) {
sprops.os_name = "Windows Server 2022";
} else if (buildNumber > 17676) {
} else if (buildNumber > 17762) {
sprops.os_name = "Windows Server 2019";
} else {
sprops.os_name = "Windows Server 2016";
Expand Down

3 comments on commit 7012d4b

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MBaesken
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 7012d4b Oct 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MBaesken the backport was successfully created on the branch MBaesken-backport-7012d4ba in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 7012d4ba from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 6 Oct 2022 and was reviewed by Alan Bateman and Roger Riggs.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev MBaesken-backport-7012d4ba:MBaesken-backport-7012d4ba
$ git checkout MBaesken-backport-7012d4ba
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev MBaesken-backport-7012d4ba

Please sign in to comment.