[8u] RFR: 8203357: Container Metrics

[Severin Gehwolf]

Hi Andrew!

On Fri, 2020-08-07 at 06:01 +0100, Andrew Hughes wrote:
> On 11:35 Thu 06 Aug     , Severin Gehwolf wrote:
> 
> snip...
> 
> > > New webrev:
> > > http://cr.openjdk.java.net/~sgehwolf/webrevs/JDK-8203357/jdk8/02/webrev/
> > > 
> > > Thoughts?
> > 
> > Ping? This is blocking some other backports in my queue.
> > 
> > Thanks,
> > Severin
> > 
> 
> This is the first time I've seen this. I was busy with the 8u265
> release last week and then away on the Thursday.

OK. Thanks for the review!

> To make this manageable, I again split it into the existing changes
> and the three new files, LauncherHelper.java, launcher.properties and
> Settings.java.
> 
> Comparing this patch (sans changes to those files) with the original
> shows the author tags being reinstated. Looks fine.
> 
> Comparing the three new sets of changes with the 11u changes:
> 
> * LauncherHelper.java: Missing copyright header change.

Fixed here:
https://cr.openjdk.java.net/~sgehwolf/webrevs/JDK-8203357/jdk8/03/webrev/

> * launcher.properties: Ordering is different in 8u but change seems ok.
> * Settings.java: is checkNoContains the same as checkNotContains?

I believe so, yes.

JDK 8's checkNoContains is:
    static void checkNoContains(TestResult tr, String str) {
        if (tr.contains(str)) {
            System.out.println(tr.status);
            throw new RuntimeException(str + " found");
        }
    }

JDK 11's checkNotContains is:
    static void checkNotContains(TestResult tr, String str) {
        if (!tr.notContains(str)) {
            System.out.println(tr);
            throw new RuntimeException(str + " found");
        }
    }


> JDK-8154470 seems to suggest so, as well as explaining the indentation
> difference as well.
> 
> Action items; just the missing copyright header, AFAICS.

Thanks! Fixed in webrev 03:
https://cr.openjdk.java.net/~sgehwolf/webrevs/JDK-8203357/jdk8/03/webrev/

Thanks,
Severin