[11u] RDR: backport JDK-8211300 and JDK-8212678

[Ichiroh Takiguchi]

Hello Aleksey.

I'd like to request jdk11u-fix-no against JDK-8211300.

I created new fix against JDK-8212678.

Change: https://cr.openjdk.java.net/~itakiguchi/8212678/webrev.02/
Bug:    https://bugs.openjdk.java.net/browse/JDK-8212678

Could you review the fix ?
I used changeset 33b96cbd16f3,
I just changed Copyright year.

Could you push it ?

Please let me know if I need to do something more.

Thanks,
Ichiroh Takiguchi

On 2019-05-01 01:32, Aleksey Shipilev wrote:
> On 4/30/19 3:18 PM, Ichiroh Takiguchi wrote:
>> Do I have to wait for approval for JDK-8211300 ?
> 
> 339 files changed, 1645 insertions(+), 1645 deletions(-) [+]
> 
> I would not count on it :) I am surprised there is no jdk11u-fix-no on
> that patch!
> 
>> Or, should I rewrite JDK-8212678's fix ?
> 
> Yes, why would you need the JDK-8211300 cleanup for this to apply? I
> just tried to apply this to
> jdk-updates/jdk11u-dev, and it has a single reject here:
> 
> --- WInputMethod.java
> +++ WInputMethod.java
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights 
> reserved.
> + * Copyright (c) 1997, 2019, 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
> 
> It does not make sense to pull in 3 KLOC cleanup change just to avoid
> this conflict.
> 
> -Aleksey