Skip to content

Commit

Permalink
8268103: JNI functions incorrectly return a double after JDK-8265836
Browse files Browse the repository at this point in the history
Reviewed-by: dholmes
  • Loading branch information
jerboaa committed Jun 2, 2021
1 parent 6765f90 commit 2963c9e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Expand Up @@ -55,7 +55,7 @@ JNIEXPORT jlong JNICALL
Java_com_sun_management_internal_OperatingSystemImpl_getHostTotalCpuTicks0
(JNIEnv *env, jobject mbean)
{
return -1.0;
return -1;
}

JNIEXPORT jint JNICALL
Expand Down
Expand Up @@ -171,7 +171,7 @@ JNIEXPORT jlong JNICALL
Java_com_sun_management_internal_OperatingSystemImpl_getHostTotalCpuTicks0
(JNIEnv *env, jobject mbean)
{
return -1.0;
return -1;
}

JNIEXPORT jint JNICALL
Expand Down

8 comments on commit 2963c9e

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@jerboaa
Copy link
Contributor Author

@jerboaa jerboaa commented on 2963c9e Jun 8, 2021

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 2963c9e Jun 8, 2021

Choose a reason for hiding this comment

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

@jerboaa could not automatically backport 2963c9e6 to openjdk/jdk11u-dev due to conflicts in the following files:

  • src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c
  • src/jdk.management/macosx/native/libmanagement_ext/UnixOperatingSystem.c

To manually resolve these conflicts run the following commands in your personal fork of openjdk/jdk11u-dev:

$ git checkout -b jerboaa-backport-2963c9e6
$ git fetch --no-tags https://git.openjdk.java.net/jdk 2963c9e6778b95f5c0fc4298064a21d1e8f31b91
$ git cherry-pick --no-commit 2963c9e6778b95f5c0fc4298064a21d1e8f31b91
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 2963c9e6778b95f5c0fc4298064a21d1e8f31b91'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 2963c9e6778b95f5c0fc4298064a21d1e8f31b91.

@jerboaa
Copy link
Contributor Author

@jerboaa jerboaa commented on 2963c9e Jun 8, 2021

Choose a reason for hiding this comment

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

NVM. JDK-8265836 needs to go in first.

@jerboaa
Copy link
Contributor Author

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 2963c9e Jun 11, 2021

Choose a reason for hiding this comment

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

@jerboaa could not automatically backport 2963c9e6 to openjdk/jdk11u-dev due to conflicts in the following files:

  • src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c
  • src/jdk.management/macosx/native/libmanagement_ext/UnixOperatingSystem.c

To manually resolve these conflicts run the following commands in your personal fork of openjdk/jdk11u-dev:

$ git checkout -b jerboaa-backport-2963c9e6
$ git fetch --no-tags https://git.openjdk.java.net/jdk 2963c9e6778b95f5c0fc4298064a21d1e8f31b91
$ git cherry-pick --no-commit 2963c9e6778b95f5c0fc4298064a21d1e8f31b91
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 2963c9e6778b95f5c0fc4298064a21d1e8f31b91'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 2963c9e6778b95f5c0fc4298064a21d1e8f31b91.

@jerboaa
Copy link
Contributor Author

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 2963c9e Jun 14, 2021

Choose a reason for hiding this comment

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

@jerboaa could not automatically backport 2963c9e6 to openjdk/jdk11u-dev due to conflicts in the following files:

  • src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c
  • src/jdk.management/macosx/native/libmanagement_ext/UnixOperatingSystem.c

To manually resolve these conflicts run the following commands in your personal fork of openjdk/jdk11u-dev:

$ git checkout -b jerboaa-backport-2963c9e6
$ git fetch --no-tags https://git.openjdk.java.net/jdk 2963c9e6778b95f5c0fc4298064a21d1e8f31b91
$ git cherry-pick --no-commit 2963c9e6778b95f5c0fc4298064a21d1e8f31b91
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 2963c9e6778b95f5c0fc4298064a21d1e8f31b91'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 2963c9e6778b95f5c0fc4298064a21d1e8f31b91.

Please sign in to comment.