Mercurial > hg > graal-compiler
changeset 1866:644f98c78e33
Merge
author | acorn |
---|---|
date | Mon, 04 Oct 2010 10:08:29 -0700 |
parents | dfb38ea7da17 (current diff) 1c352af0135d (diff) |
children | b6aedd1acdc0 |
files | |
diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/linux/vm/os_linux.cpp Thu Sep 30 12:05:08 2010 -0400 +++ b/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/src/os/solaris/vm/os_solaris.cpp Thu Sep 30 12:05:08 2010 -0400 +++ b/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/src/os/windows/vm/os_windows.cpp Thu Sep 30 12:05:08 2010 -0400 +++ b/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) {