From b4e6ed162782cfc3161f1d80aa2c638d7182b0b0 Mon Sep 17 00:00:00 2001
From: rriggs <unknown>
Date: Wed, 19 Nov 2014 21:28:26 -0500
Subject: [PATCH] 8065372: Object.wait(ms, ns) timeout returns early
 Reviewed-by: martin, dholmes

---
 src/share/classes/java/lang/Object.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/share/classes/java/lang/Object.java b/src/share/classes/java/lang/Object.java
index d4bf7f655..bff85ddcb 100644
--- a/src/share/classes/java/lang/Object.java
+++ b/src/share/classes/java/lang/Object.java
@@ -453,7 +453,7 @@ public class Object {
                                 "nanosecond timeout value out of range");
         }
 
-        if (nanos >= 500000 || (nanos != 0 && timeout == 0)) {
+        if (nanos > 0) {
             timeout++;
         }
 
-- 
GitLab