RFR of 8194284: CheckRegisterInLog.java fails with java.lang.RuntimeException: CheckRegisterInLog got exception timeout 6480000ms out of range

[David Holmes]

Hi Hamlin,

This should probably be reviewed on core-libs-dev. I don't think jdk-dev 
is intended for code reviews.

On 18/01/2018 4:59 PM, Hamlin Li wrote:
> Would you please review the following patch?
> 
> bug: https://bugs.openjdk.java.net/browse/JDK-8194284
> 
> webrev as below.

I don't agree with this. Whatever is passing the incorrect timeout to 
the TestLibrary should be fixed. The bug report needs more information 
about where the incorrect value is coming from and why.

Cheers,
David

> 
> Thank you
> 
> -Hamlin
> 
> ------------------------------------------------------------------------
> 
> diff -r 0dec8c41170c test/jdk/java/rmi/testlibrary/TestLibrary.java
> --- a/test/jdk/java/rmi/testlibrary/TestLibrary.java    Wed Jan 17 
> 20:07:50 2018 -0800
> +++ b/test/jdk/java/rmi/testlibrary/TestLibrary.java    Thu Jan 18 
> 14:54:50 2018 +0800
> @@ -188,8 +188,12 @@
>       public static long computeDeadline(long timestamp, long timeout) {
>           final long MAX_TIMEOUT_MS = 3_600_000L;
> 
> -        if (timeout < 0L || timeout > MAX_TIMEOUT_MS) {
> +        if (timeout < 0L) {
>               throw new IllegalArgumentException("timeout " + timeout + 
> "ms out of range");
> +        } else if (timeout > MAX_TIMEOUT_MS) {
> +            System.out.format("timeout value(%d) exceeds 
> MAX_TIMEOUT_MS(%d), "
> +                    + "use MAX_TIMEOUT_MS instead!%n", timeout, 
> MAX_TIMEOUT_MS);
> +            timeout = MAX_TIMEOUT_MS;
>           }
> 
>           return timestamp + (long)(timeout * getTimeoutFactor());
>