8185529: JCK api/java_lang/Object/WaitTests failed with jdk10/hs nightly

Reviewed-by: dcubed, ccheung
This commit is contained in:
David Holmes 2017-10-09 01:23:13 -04:00
parent 0d8679e178
commit 2d8670326d

View File

@ -1770,6 +1770,12 @@ int os::PlatformEvent::park(jlong millis) {
if (v == 0) { // Do this the hard way by blocking ...
struct timespec abst;
// We have to watch for overflow when converting millis to nanos,
// but if millis is that large then we will end up limiting to
// MAX_SECS anyway, so just do that here.
if (millis / MILLIUNITS > MAX_SECS) {
millis = jlong(MAX_SECS) * MILLIUNITS;
}
to_abstime(&abst, millis * (NANOUNITS / MILLIUNITS), false);
int ret = OS_TIMEOUT;