archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8210787: Object.wait(long, int) throws inappropriate IllegalArgumentException

Browse source 
Reviewed-by: martin, rriggs
This commit is contained in:
Ivan Gerasimov 2018-09-15 13:53:43 -07:00
parent 8ef50b1dc3
commit a07102bc7f
2 changed files with 48 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/java/lang/Object.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1994, 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1994, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -455,7 +455,7 @@ public class Object {
"nanosecond timeout value out of range"); "nanosecond timeout value out of range");
} }
if (nanos > 0) { if (nanos > 0 && timeoutMillis < Long.MAX_VALUE) {
timeoutMillis++; timeoutMillis++;
} }

46
test/jdk/java/lang/Object/WaitTooLong.java Normal file
View file

@ -0,0 +1,46 @@
/*
* Copyright (c) 2018, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8210787
* @summary Object.wait(long, int) throws inappropriate IllegalArgumentException
*/
public class WaitTooLong {
public static void main(String[] args) {
test(0);
test(1);
test(500000);
test(999999);
}
static void test(int nanos) {
try {
WaitTooLong.class.wait(Long.MAX_VALUE, nanos);
} catch (IllegalMonitorStateException expected) {
} catch (IllegalArgumentException | InterruptedException unexpected) {
throw new RuntimeException("Unexpected", unexpected);
}
}
}