Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authoracorn
Mon, 04 Oct 2010 10:08:29 -0700
changeset 6963 58adcb17d304
parent 6961 a32b2fc66321 (current diff)
parent 6962 d49132ce025b (diff)
child 6964 6e45ffa3bccf
Merge
--- a/hotspot/src/os/linux/vm/os_linux.cpp	Thu Sep 30 12:05:08 2010 -0400
+++ b/hotspot/src/os/linux/vm/os_linux.cpp	Mon Oct 04 10:08:29 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -4839,7 +4839,7 @@
 
   // Next, demultiplex/decode time arguments
   timespec absTime;
-  if (time < 0) { // don't wait at all
+  if (time < 0 || (isAbsolute && time == 0) ) { // don't wait at all
     return;
   }
   if (time > 0) {
--- a/hotspot/src/os/solaris/vm/os_solaris.cpp	Thu Sep 30 12:05:08 2010 -0400
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp	Mon Oct 04 10:08:29 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -5837,7 +5837,7 @@
 
   // First, demultiplex/decode time arguments
   timespec absTime;
-  if (time < 0) { // don't wait at all
+  if (time < 0 || (isAbsolute && time == 0) ) { // don't wait at all
     return;
   }
   if (time > 0) {
--- a/hotspot/src/os/windows/vm/os_windows.cpp	Thu Sep 30 12:05:08 2010 -0400
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Mon Oct 04 10:08:29 2010 -0700
@@ -3992,7 +3992,7 @@
   if (time < 0) { // don't wait
     return;
   }
-  else if (time == 0) {
+  else if (time == 0 && !isAbsolute) {
     time = INFINITE;
   }
   else if  (isAbsolute) {
jdk-sandbox