[8u-dev] Request for approval: backport of JDK-8160119

[Sean Coffey]

Approved.

regards,
Sean.


On 22/09/2016 13:37, Boris Molodenkov wrote:
> Hi,
>
> I would like to backport JDK-8160119 to 8u-dev
> The changeset from JDK9 is almost the same.
> File location and lines offset differ only.
>
> diff -r 65847ffbff14 
> test/testlibrary/com/oracle/java/testlibrary/Utils.java
> --- a/test/testlibrary/com/oracle/java/testlibrary/Utils.java Wed Sep 
> 07 16:43:32 2016 -0400
> +++ b/test/testlibrary/com/oracle/java/testlibrary/Utils.java Thu Sep 
> 22 15:32:43 2016 +0300
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights 
> reserved.
> + * Copyright (c) 2013, 2016, 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
> @@ -260,8 +260,8 @@
>              output = 
> ProcessTools.executeProcess(jcmdLauncher.getCommand());
>              output.shouldHaveExitValue(0);
>
> -            // Search for a line starting with numbers (pid), follwed 
> by the key.
> -            Pattern pattern = Pattern.compile("([0-9]+)\\s.*(" + key 
> + ").*\\r?\\n");
> +            // Search for a line starting with numbers (pid), 
> followed by the key.
> +            Pattern pattern = Pattern.compile("^([0-9]+)\\s.*(" + key 
> + ")", Pattern.MULTILINE);
>              Matcher matcher = pattern.matcher(output.getStdout());
>
>              int pid = -1;
>
> Bug id: https://bugs.openjdk.java.net/browse/JDK-8160119
> Changeset: http://hg.openjdk.java.net/jdk9/hs/hotspot/rev/9f5a448947a4
> Review thread for original fix:
> http://mail.openjdk.java.net/pipermail/hotspot-dev/2016-July/023866.html
>
> Thanks,
> Boris
>