[jdk11u-dev] RFR: 8300424: [11u] Chunk lost in backport of 8297569

Wed Jan 18 09:24:34 UTC 2023

On Wed, 18 Jan 2023 07:29:02 GMT, Goetz Lindenmaier <goetz at openjdk.org> wrote:

> This change belongs to JDK-8297569.
> 
> Please compare the push:
> https://github.com/openjdk/jdk11u-dev/commit/71e89e121c318cd2627d2c1b46962b157483ab31
> and what I originally backported:
> https://github.com/openjdk/jdk11u-dev/pull/1651/commits/c7527505a3dd425914c3037f3e4e003654119bc7
> 
> 8297569 was a dependent pull request on top of 8294378.
> After pushing 8294378 skara rebased the PR on top and asked me to resolve.
> The resolve dialog in the web interface only found conflicts in URLPermission.java.
> The other two files were resolved automatically.  So I missed this difference.
> As the merge change is empty, I did not detect this.

Looks fine. Thanks for fixing it!

-------------

Marked as reviewed by sgehwolf (Reviewer).

PR: https://git.openjdk.org/jdk11u-dev/pull/1668